summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/label-subscription-api' into 'master' Douwe Maan2016-05-123-0/+104
|\
| * Add API endpoints for un/subscribing from/to a labelAhmad Sherif2016-05-123-0/+104
* | Merge branch 'health-check-route'Douwe Maan2016-05-124-0/+177
|\ \ | |/ |/|
| * Support token header for health check token, and general cleanup of the healt...DJ Mountney2016-05-111-0/+15
| * Add tests for the health check featureDJ Mountney2016-05-104-0/+162
* | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'Douwe Maan2016-05-122-1/+55
|\ \
| * | more readable specs for enabled_button_based_providers and button_based_provi...Andrei Gliga2016-05-121-15/+29
| * | DRYing enabled_button_based_providers testsAndrei Gliga2016-05-121-7/+4
| * | enabled_button_based_providers into their own describe sectionAndrei Gliga2016-05-121-0/+2
| * | use stub_application_setting insteadAndrei Gliga2016-05-121-10/+4
| * | between ""Andrei Gliga2016-05-121-1/+1
| * | stub Devise.omniauth_providers to return GitHub even if the gitlab.yml has no...Andrei Gliga2016-05-121-2/+8
| * | tests for button_based_providers_enabled? helper method of AuthHelperAndrei Gliga2016-05-121-0/+18
| * | tests for enabled_button_based_providers helper method of AuthHelperAndrei Gliga2016-05-121-1/+21
| * | validate disabled_oauth_sign_in_sources in ApplicationSeAndrei Gliga2016-05-121-0/+3
* | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-33/+78
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-1062-893/+468
| |\ \ \
| * | | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-33/+78
* | | | | Removed tracking of total method execution timestotal-method-timeYorick Peterse2016-05-121-6/+0
| |_|/ / |/| | |
* | | | 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
|\ \ \ \ \ \ \