Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix tab behavior on MergeRequests#newrs-toggle-tab | Robert Speicher | 2015-04-21 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-21 | 1 | -1/+0 |
|\ | |||||
| * | Merge branch 'fix-duplicate-changelog-entry' into 'master' | Hannes Rosenögger | 2015-04-21 | 1 | -1/+0 |
| |\ | | | | | | | | | | | | | | | | Remove entry that was shipped in v7.9.1 See merge request !532 | ||||
| | * | Remove entry that was shipped in v7.9.1 | Stan Hu | 2015-04-16 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-04-21 | 1 | -0/+1 |
|\ \ \ | |||||
| * \ \ | Merge pull request #8510 from koebi001/feature/backup_restore | Dmitriy Zaporozhets | 2015-04-21 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| | | add environment variable force to the documentation | ||||
| | * | | add environment variable force to the documentation | Markus Köberl | 2014-12-29 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'rs-reference-filters' into 'master' | Dmitriy Zaporozhets | 2015-04-21 | 30 | -870/+2124 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Skip failing test until usernames can't end in periods again | Robert Speicher | 2015-04-20 | 1 | -0/+1 |
| | | | | |||||
| * | | | Tweak single-word label regex to fix pending spec. | Douwe Maan | 2015-04-20 | 2 | -2/+1 |
| | | | | |||||
| * | | | project_from_ref returns nil when reference doesn't exist. | Douwe Maan | 2015-04-20 | 2 | -11/+14 |
| | | | | |||||
| * | | | Update markdown docs with latest references | Robert Speicher | 2015-04-20 | 1 | -18/+25 |
| | | | | | | | | | | | | | | | | Also, tables! (╯°□°)╯︵ ┻━┻) | ||||
| * | | | project_from_ref returns nil when reference can't be accessed | Robert Speicher | 2015-04-20 | 7 | -11/+16 |
| | | | | | | | | | | | | | | | | | | | | Prior it would return the project from the current context, which wasn't the intended behavior. | ||||
| * | | | Add more tests for cross-project references | Robert Speicher | 2015-04-20 | 6 | -84/+139 |
| | | | | |||||
| * | | | 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 | 13 | -7/+52 |
| | | | | |||||
| * | | | Add spec for ReferenceExtractor#labels | Robert Speicher | 2015-04-20 | 1 | -0/+9 |
| | | | | |||||
| * | | | 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 | 2 | -7/+19 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
| * | | | Fix cross-project reference specs for new permission check | Robert Speicher | 2015-04-20 | 5 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | For simplicity's sake, since we're testing the actual referencing, we just force the permission check to always be allowed. | ||||
| * | | | 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 | 2 | -12/+49 |
| | | | | |||||
| * | | | Remove more now-invalid specs | Robert Speicher | 2015-04-20 | 1 | -66/+0 |
| | | | | |||||
| * | | | Fix broken spec | Robert Speicher | 2015-04-20 | 1 | -11/+1 |
| | | | | |||||
| * | | | Re-arrange spec/helpers/gitlab_markdown_helper_spec a bit | Robert Speicher | 2015-04-20 | 1 | -111/+111 |
| | | | | |||||
| * | | | Begin cleaning out spec/helpers/gitlab_markdown_helper_spec | Robert Speicher | 2015-04-20 | 2 | -335/+31 |
| | | | | |||||
| * | | | 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 | 2 | -7/+26 |
| | | | | |||||
| * | | | Add name-based referencing to LabelReferenceFilter | Robert Speicher | 2015-04-20 | 2 | -26/+130 |
| | | | | |||||
| * | | | Remove duplicate ampersand from Label title format validator | Robert Speicher | 2015-04-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix ReferenceExtractor spec | Robert Speicher | 2015-04-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Run SanitizationFilter before our reference filters | Robert Speicher | 2015-04-20 | 1 | -2/+7 |
| | | | | |||||
| * | | | Add more GFM reference examples to docs | Robert Speicher | 2015-04-20 | 1 | -2/+6 |
| | | | | |||||
| * | | | Make CommitRange and Snippets cross-referable | Robert Speicher | 2015-04-20 | 4 | -67/+96 |
| | | | | |||||
| * | | | Fix GitlabMarkdownHelper spec | Robert Speicher | 2015-04-20 | 2 | -3/+11 |
| | | | | |||||
| * | | | Reference filters :sparkles: | Robert Speicher | 2015-04-20 | 24 | -341/+1728 |
| | | | | | | | | | | | | | | | | | | | | Commit ranges, commits, external issues, issues, labels, merge requests, snippets, users. | ||||
* | | | | Merge branch 'upgrade-guide-gitlab-shell' into 'master' | Dmitriy Zaporozhets | 2015-04-21 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7.10 requires gitlab-shell 2.6.2. Fixes #1467. See merge request !552 | ||||
| * | | | | 7.10 requires gitlab-shell 2.6.2.upgrade-guide-gitlab-shell | Douwe Maan | 2015-04-21 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-21 | 9 | -36/+79 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/import/google_code_controller.rb | ||||
| * \ \ \ | Merge branch 'google-code-fixes' into 'master' | Dmitriy Zaporozhets | 2015-04-21 | 4 | -32/+72 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some issues with Google Code importer Thanks, @mrtux, for reporting all of these. See merge request !551 | ||||
| | * | | | | Update Google Code importer test.google-code-fixes | Douwe Maan | 2015-04-21 | 1 | -3/+4 |
| | | | | | | |||||
| | * | | | | Improve description of Google Code import user map. | Douwe Maan | 2015-04-21 | 1 | -3/+25 |
| | | | | | |