summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '17227-upcoming-milestone-is-confusing-when-projects-have-differ...Douwe Maan2016-05-162-67/+146
|\
| * Return a relation with Postgres17227-upcoming-milestone-is-confusing-when-projects-have-different-milestonesSean McGivern2016-05-161-1/+3
| * Make upcoming milestone work across projectsSean McGivern2016-05-162-0/+65
| * Tidy up IssuesFinder specsSean McGivern2016-05-161-68/+80
* | Merge branch '13691-allow-admin-to-reset-user-password-and-force-password-res...Robert Speicher2016-05-162-0/+79
|\ \
| * | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-loginSean McGivern2016-05-162-0/+79
| |/
* | Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-164-0/+349
|\ \
| * | Fix http status codes for container registry authentication serviceKamil Trzcinski2016-05-151-11/+6
| * | Improve authentication service specsKamil Trzcinski2016-05-152-16/+56
| * | Update JwtController specsKamil Trzcinski2016-05-151-36/+21
| * | Added specs for JwtControllerKamil Trzcinski2016-05-141-0/+87
| * | Rename JWT to JSONWebTokenKamil Trzcinski2016-05-143-3/+3
| * | Fix authentication serviceKamil Trzcinski2016-05-141-0/+1
| * | Rename specsKamil Trzcinski2016-05-141-1/+1
| * | Use Auth::ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-141-1/+1
| * | Fix specsKamil Trzcinski2016-05-141-1/+1
| * | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-1398-1096/+1354
| |\ \
| * | | Fix CI testsKamil Trzcinski2016-05-123-30/+30
| * | | Added rspec for testing container registry authentication serviceKamil Trzcinski2016-05-093-0/+241
* | | | Merge branch 'gh-pull-requests'Douwe Maan2016-05-163-32/+100
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix validation method for Gitlab::GithubImport::PullRequestFormatterDouglas Barbosa Alexandre2016-05-132-2/+16
| * | | Extract GitHub branch formatterDouglas Barbosa Alexandre2016-05-132-88/+57
| * | | Import PRs where branch names were reused across PRsDouglas Barbosa Alexandre2016-05-131-6/+26
| * | | Preserve commits/diff/comments for PRs that were merged on GitHubDouglas Barbosa Alexandre2016-05-132-2/+19
| * | | Fix spec for Gitlab::GithubImport::PullRequestFormatterDouglas Barbosa Alexandre2016-05-131-22/+70
| | |/ | |/|
* | | Add cache count metrics to rails cacheadd-cache-count-metricsPablo Carranza2016-05-151-5/+11
* | | Update specsDouwe Maan2016-05-133-78/+4
* | | Clean up LegacyDiffNote somewhatDouwe Maan2016-05-131-0/+74
* | | Extract LegacyDiffNote out of NoteDouwe Maan2016-05-131-6/+2
|/ /
* | Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-1312-45/+45
* | Merge branch 'fix_health_check_type' into 'master' Douwe Maan2016-05-121-1/+1
|\ \
| * | Fix minor typos in admin health check pageDrew Blessing2016-05-121-1/+1
* | | Merge branch 'rs-cleanup-events_helper_spec' into 'master' Douwe Maan2016-05-121-47/+48
|\ \ \
| * | | Clean up EventsHelper specRobert Speicher2016-05-121-47/+48
* | | | Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-123-7/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-083-7/+7
| | |/ | |/|
* | | Merge branch 'default-scope-on-builds-page' into 'master' Robert Speicher2016-05-122-0/+2
|\ \ \
| * | | Fix a description for default scope on buildsTakuya Noguchi2016-05-132-0/+2
* | | | 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