summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Implement @rymai's feedback after review.Timothy Andrew2016-05-121-2/+10
* Add a spec for `WikiLinkFilter`Timothy Andrew2016-05-121-0/+77
* Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan2016-05-112-4/+59
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-1164-894/+606
| |\
| * | Add specs for user routing and update spec for user controllerLong Nguyen2016-05-082-0/+59
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-088-29/+360
| |\ \
| * | | user routings refactorLong Nguyen2016-05-081-0/+4
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-0562-410/+1660
| |\ \ \
| * | | | Remove unused code, update spec, and update changelogLong Nguyen2016-05-051-8/+0
* | | | | Merge branch 'hook-docs-behavior' into 'master' Robert Speicher2016-05-111-2/+2
|\ \ \ \ \
| * | | | | Fix test failuresJacob Vosmaer2016-05-091-2/+2
* | | | | | Merge branch '17249-starred' into 'master' Robert Speicher2016-05-112-12/+28
|\ \ \ \ \ \
| * | | | | | Tidy up user project specsSean McGivern2016-05-111-13/+8
| * | | | | | Restrict starred projects to viewable onesSean McGivern2016-05-102-12/+33
* | | | | | | Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' into...Robert Speicher2016-05-113-45/+58
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Only generate repository push email onceSean McGivern2016-05-113-45/+58
* | | | | | | Merge branch 'stanhu/gitlab-ce-add-eager-load-lib' into 'master' Robert Speicher2016-05-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix a few places where autoloading would failRémy Coutable2016-05-101-1/+1
* | | | | | | | Fix an issue when filtering merge requests with more than one labelRémy Coutable2016-05-101-0/+137
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'fix/using-uploads-in-global-snippets' into 'master' Robert Speicher2016-05-101-0/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Do not process upload links if no project contextGrzegorz Bizon2016-05-101-3/+3
| * | | | | | Fix using link to uploads in global snippetsGrzegorz Bizon2016-05-101-0/+18
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-1053-886/+220
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '2460-3690-support-multiline-tag-message' into 'master' Rémy Coutable2016-05-104-0/+218
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Add integration specs for tagsRémy Coutable2016-05-104-0/+218
| * | | | | | | Merge branch 'revert-4026' into 'master' Rémy Coutable2016-05-102-4/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Revert "Merge branch 'wiki-fix' into 'master' "Rémy Coutable2016-05-102-4/+2
| * | | | | | | Merge branch 'remove-annotate-gem' into 'master' Yorick Peterse2016-05-1047-882/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-0947-882/+0
* | | | | | | | Use a case-insensitive comparison in sanitizing URI schemesStan Hu2016-05-091-0/+6
|/ / / / / / /
* | | | | | | Merge branch 'fix/todos-for-private-group-mentions' into 'master' Douwe Maan2016-05-091-0/+19
|\ \ \ \ \ \ \
| * | | | | | | Fix adding a todo for private group membersAhmad Sherif2016-05-071-0/+19
* | | | | | | | Merge branch 'issue_15394' into 'master' Rémy Coutable2016-05-093-1/+17
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Sanitize milestones and label titlesissue_15394Felipe Artur2016-05-053-1/+17
* | | | | | | | Merge branch '2954-api-expose-issue-user_notes_count' into 'master' Rémy Coutable2016-05-092-0/+49
|\ \ \ \ \ \ \ \
| * | | | | | | | Expose MergeRequest#user_notes_count in the API and use the method in issues ...Rémy Coutable2016-05-092-14/+48
| * | | | | | | | API: Expose Issue#user_notes_countcnam-dep2016-05-091-0/+15
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rs-backport-ee-372' into 'master' Rémy Coutable2016-05-093-8/+75
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372Robert Speicher2016-05-043-8/+75
| |/ / / / / /
* | | | | | | Merge branch 'wiki-fix' into 'master' Rémy Coutable2016-05-092-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Use the proper GitLab URL for links in WikiArtem Sidorenko2016-05-092-2/+4
* | | | | | | | Merge branch 'rs-remove-wall_enabled' into 'master' Dmitriy Zaporozhets2016-05-092-2/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove `wall_enabled` field from Projectrs-remove-wall_enabledRobert Speicher2016-05-082-2/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'trusted-proxies-ip-addr' into 'master' Rémy Coutable2016-05-091-0/+51
|\ \ \ \ \ \ \
| * | | | | | | Add tests for setting trusted_proxiestrusted-proxies-ip-addrDJ Mountney2016-05-041-0/+51
* | | | | | | | Merge branch 'escape-commit-titles' into 'master' Robert Speicher2016-05-081-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Escape HTML in commit titles in system note messagesStan Hu2016-05-071-0/+9
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-build-notification-on-merge-page-change' into 'master' Stan Hu2016-05-081-0/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix build notification on merge request page change even if the build status ...Benedikt Huss2016-05-081-0/+6
| |/ / / / / /
* | | | | | | Update SVG sanitizer to conform to SVG 1.1Stan Hu2016-05-063-0/+112
|/ / / / / /