Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #8644 from Bugagazavr/hook-events | Dmitriy Zaporozhets | 2015-04-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add X-GitLab-Event header for web hooks | |||||
| * | | | | | | Added X-GitLab-Event header for web hooks | bugagazavr | 2015-04-25 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #9186 from Senorsen/patch-1 | Dmitriy Zaporozhets | 2015-04-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix contributions calendar empty problem under mysql | |||||
| * | | | | | | Fix contributions calendar empty problem under mysql | Zhang Sen | 2015-04-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using MySQL as database backend in GitLab, ``date`` in ``date(created_at), count(id) as total_amount`` won't return the ``date`` column (should be ``date(created_at)``), as a result, there's no contribution in the user profile page. Adding an ``as date`` can solve this problem. | |||||
* | | | | | | | fix redis 3.0.0 | tonic | 2015-04-25 | 1 | -1/+2 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Revert "Rename namespace_regex to namespace_path_regex." | Douwe Maan | 2015-04-24 | 4 | -7/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c0116926c743818b2593474946abb40b56d8fefa. | |||||
* | | | | | | Rename namespace_regex to namespace_path_regex. | Douwe Maan | 2015-04-24 | 4 | -7/+7 | |
| | | | | | | ||||||
* | | | | | | Revert "Revert disallowing usernames to end in period." | Douwe Maan | 2015-04-24 | 1 | -2/+2 | |
| |_|_|/ / |/| | | | | | | | | | | | | | | This reverts commit c75c6b840ba9ed82bb01eca52e968c2b0ec985e6. | |||||
* | | | | | Fix errors. | Douwe Maan | 2015-04-24 | 1 | -1/+0 | |
| | | | | | ||||||
* | | | | | No longer needed to pass project argument to commit methods. | Douwe Maan | 2015-04-24 | 2 | -3/+2 | |
| | | | | | ||||||
* | | | | | Use project.commit convenience method. | Douwe Maan | 2015-04-24 | 7 | -10/+10 | |
| | | | | | ||||||
* | | | | | Let commit model know about its project. | Douwe Maan | 2015-04-24 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Provide autoload paths for filters to prevent circular dependency | Robert Speicher | 2015-04-23 | 2 | -4/+15 | |
| | | | | ||||||
* | | | | Merge branch 'issue-body-code-mentions' into 'master' | Dmitriy Zaporozhets | 2015-04-23 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug causing at-username inside code blocks to sometimes be picked up as a user mention. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2254. See merge request !553 | |||||
| * | | | | Fix bug causing `@whatever` inside code blocks to sometimes be picked up as ↵issue-body-code-mentions | Douwe Maan | 2015-04-21 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | a user mention. | |||||
* | | | | | Use `search_text_nodes` helper in our custom filtersrs-search_text_nodes | Robert Speicher | 2015-04-22 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | Closes #1477 | |||||
* | | | | | Update Gitlab::Markdown to use the :new: EmojiFilter :sparkles: | Robert Speicher | 2015-04-21 | 1 | -12/+16 | |
| | | | | | | | | | | | | | | | | | | | | Removes emoji-centric tests from GFM specs :boom: | |||||
* | | | | | Add Gitlab::Markdown::EmojiFilter | Robert Speicher | 2015-04-21 | 1 | -0/+79 | |
| | | | | | ||||||
* | | | | | Merge branch 'rs-reference-filters' into 'master' | Dmitriy Zaporozhets | 2015-04-21 | 12 | -285/+874 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert GFM reference handling to html-pipeline filters - `Gitlab::Markdown` is now much cleaner - Better separation of concerns - Cleaner, less brittle, more maintainable specs for each reference type. - Label references actually work! See merge request !1753 | |||||
| * | | | | | Tweak single-word label regex to fix pending spec. | Douwe Maan | 2015-04-20 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | project_from_ref returns nil when reference doesn't exist. | Douwe Maan | 2015-04-20 | 1 | -9/+6 | |
| | | | | | | ||||||
| * | | | | | project_from_ref returns nil when reference can't be accessed | Robert Speicher | 2015-04-20 | 6 | -9/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior it would return the project from the current context, which wasn't the intended behavior. | |||||
| * | | | | | Better commit lookup for CommitRangeReferenceFilter | Robert Speicher | 2015-04-20 | 1 | -3/+15 | |
| | | | | | | ||||||
| * | | | | | Remove extraneous IGNORE_PARENTS from filter | Robert Speicher | 2015-04-20 | 1 | -4/+0 | |
| | | | | | | ||||||
| * | | | | | Fix `user_can_reference_project?` check | Robert Speicher | 2015-04-20 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Escape title attributes in references | Robert Speicher | 2015-04-20 | 6 | -5/+10 | |
| | | | | | | ||||||
| * | | | | | Better guard against nil projects in ReferenceFilter | Robert Speicher | 2015-04-20 | 2 | -2/+7 | |
| | | | | | | ||||||
| * | | | | | Minor doc fix | Robert Speicher | 2015-04-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | Fix Issue and ExternalIssue reference specs | Robert Speicher | 2015-04-20 | 1 | -0/+4 | |
| | | | | | | ||||||
| * | | | | | DRY up reference filters using ReferenceFilter base class | Robert Speicher | 2015-04-20 | 10 | -320/+55 | |
| | | | | | | ||||||
| * | | | | | Add a ReferenceFilter base class | Robert Speicher | 2015-04-20 | 1 | -0/+68 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow for the removal of a lot of duplication from the reference filters. | |||||
| * | | | | | Fix `user_can_reference_group?` check | Robert Speicher | 2015-04-20 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | Add permission check to ReferenceExtractor's user mentions | Robert Speicher | 2015-04-20 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Rename `user_can_read_group?` to `user_can_reference_group?` | Robert Speicher | 2015-04-20 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Check for project read permissions in cross-references | Robert Speicher | 2015-04-20 | 1 | -3/+13 | |
| | | | | | | ||||||
| * | | | | | Add current_user to filter context | Robert Speicher | 2015-04-20 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | Remove Gitlab::Markdown from Gitlab::ReferenceExtractor | Robert Speicher | 2015-04-20 | 1 | -2/+66 | |
| | | | | | | ||||||
| * | | | | | Add permission checking to UserReferenceFilter | Robert Speicher | 2015-04-20 | 1 | -3/+12 | |
| | | | | | | ||||||
| * | | | | | Add name-based referencing to LabelReferenceFilter | Robert Speicher | 2015-04-20 | 1 | -8/+35 | |
| | | | | | | ||||||
| * | | | | | Run SanitizationFilter before our reference filters | Robert Speicher | 2015-04-20 | 1 | -2/+7 | |
| | | | | | | ||||||
| * | | | | | Make CommitRange and Snippets cross-referable | Robert Speicher | 2015-04-20 | 1 | -12/+14 | |
| | | | | | | ||||||
| * | | | | | Reference filters :sparkles: | Robert Speicher | 2015-04-20 | 10 | -283/+928 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | Commit ranges, commits, external issues, issues, labels, merge requests, snippets, users. | |||||
* | | | | | Don't autolink masked imported email addresses. | Douwe Maan | 2015-04-21 | 1 | -1/+4 | |
| | | | | | ||||||
* | | | | | Fix rendering of deleted blocking/blocked-on statuses. | Douwe Maan | 2015-04-21 | 1 | -10/+24 | |
| | | | | | ||||||
* | | | | | Import "Comment #10" as "Comment 10" to not incorrectly reference issue. | Douwe Maan | 2015-04-21 | 1 | -1/+3 | |
| | | | | | ||||||
* | | | | | Get imported links to render correctly by not escaping all special chars. | Douwe Maan | 2015-04-21 | 1 | -12/+10 | |
| | | | | | ||||||
* | | | | | Add "imported from Google Code" to imported issues. | Douwe Maan | 2015-04-21 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Revert disallowing usernames to end in period.revert-username-period | Douwe Maan | 2015-04-20 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Merge branch 'fix-label-color' into 'master' | Dmitriy Zaporozhets | 2015-04-20 | 1 | -16/+16 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parse GFM references after sanitizing Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`. See #2188. See merge request !1745 | |||||
| * | | | | Fix GFM extractions | Vinnie Okada | 2015-04-17 | 1 | -13/+13 | |
| | | | | | | | | | | | | | | | | | | | | Extract and re-insert links after sanitizing user markup. |