Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-22 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'update_grack' into 'master' | Dmitriy Zaporozhets | 2015-04-22 | 2 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Update gitlab-grack to 2.0.2. | Marin Jankovski | 2015-04-22 | 2 | -4/+4 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #8831 from bladealslayer/fix/api-user-tests | Nihad Abbasov | 2015-04-22 | 1 | -4/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix user API tests succeeding for the wrong reason | Boyan Tabakov | 2015-04-22 | 1 | -4/+9 | |
* | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2015-04-22 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs-toggle-tab' into 'master' | Dmitriy Zaporozhets | 2015-04-22 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Fix tab behavior on MergeRequests#newrs-toggle-tab | Robert Speicher | 2015-04-21 | 1 | -2/+2 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Marin Jankovski | 2015-04-22 | 3 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #9164 from dsander/fix-markdown-preview | Jeroen van Baarsen | 2015-04-22 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Make issue preview look like the result | Dominik Sander | 2015-04-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Merge pull request #9059 from chulkilee/fix-hipchat | Jeroen van Baarsen | 2015-04-22 | 2 | -2/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | do not send empty message to hipchat | Chulki Lee | 2015-04-22 | 2 | -2/+4 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'rs-remove-gitlab-pipeline' into 'master' | Dmitriy Zaporozhets | 2015-04-22 | 6 | -209/+307 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | More cleanup of gitlab_markdown_helper_spec | Robert Speicher | 2015-04-21 | 1 | -98/+92 | |
| * | | | | | | | | | | | Use Nokogiri in `link_to_gfm` specs | Robert Speicher | 2015-04-21 | 1 | -20/+22 | |
| * | | | | | | | | | | | Update Gitlab::Markdown to use the :new: EmojiFilter :sparkles: | Robert Speicher | 2015-04-21 | 2 | -86/+18 | |
| * | | | | | | | | | | | Add Gitlab::Markdown::EmojiFilter | Robert Speicher | 2015-04-21 | 2 | -0/+176 | |
| * | | | | | | | | | | | Change html-pipeline-gitlab gem to html-pipeline | Robert Speicher | 2015-04-21 | 2 | -8/+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 | 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 | Markus Köberl | 2014-12-29 | 1 | -0/+1 | |
* | | | | | | | | | | | | | Merge branch 'rs-reference-filters' into 'master' | Dmitriy Zaporozhets | 2015-04-21 | 30 | -870/+2124 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | project_from_ref returns nil when reference can't be accessed | Robert Speicher | 2015-04-20 | 7 | -11/+16 | |
| * | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | 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 |