summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Resolve discussionsMichael Kozono2017-05-051-0/+18
* Fix Rubocop failuresMichael Kozono2017-05-051-4/+4
* Redirect from redirect routes to canonical routesMichael Kozono2017-05-054-21/+341
* Add specs for new pipeline action for JSON format30237-pipelines-actions-make-2-requestsGrzegorz Bizon2017-05-051-0/+36
* Merge branch 'deploy-keys-load-async' into 'master' Filipa Lacerda2017-05-041-0/+66
|\
| * Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-045-12/+252
| |\
| * \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-0312-164/+491
| |\ \
| * \ \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-04-281-12/+354
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/29667-deploy-keys' into deploy-keys-load...Jacob Schatz2017-04-271-0/+66
| |\ \ \ \
| | * | | | Project deploy keys json end pointJarka Kadlecova2017-03-241-0/+66
* | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-0/+188
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-0/+188
| | |_|_|/ | |/| | |
* | | | | Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-041-0/+87
|\ \ \ \ \
| * | | | | Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-021-0/+87
* | | | | | Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master' Rémy Coutable2017-05-042-11/+104
|\ \ \ \ \ \
| * | | | | | Disable navigation to Pages config if Pages is disabledMark Fletcher2017-05-042-11/+104
| |/ / / / /
* | | | | | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-042-1/+61
| |/ / / / |/| | | |
* | | | | Merge branch 'async-milestone-tabs' into 'master' Jacob Schatz2017-05-032-0/+15
|\ \ \ \ \
| * | | | | Fixed failing specsPhil Hughes2017-04-261-2/+0
| * | | | | Added controller specsPhil Hughes2017-04-262-0/+17
* | | | | | Merge branch 'rs-described_class-cop-2' into 'master' Douwe Maan2017-05-021-4/+4
|\ \ \ \ \ \
| * | | | | | Auto-correct `RSpec/DescribedClass` violationsrs-described_class-cop-2Robert Speicher2017-05-011-4/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'metrics-deployment-history' into 'master' Douwe Maan2017-05-021-0/+42
|\ \ \ \ \ \
| * | | | | | Cleanup deploymentsd controller spec and use schema validation to test the ou...Pawel Chojnacki2017-04-241-9/+4
| * | | | | | Merge remote-tracking branch 'upstream/master' into 26914-add_deploy_history_...Pawel Chojnacki2017-04-2024-78/+959
| |\ \ \ \ \ \
| * | | | | | | Fix unreversible migration, and small rubocop warningsPawel Chojnacki2017-03-281-2/+2
| * | | | | | | Optionally filter by deployment timePawel Chojnacki2017-03-281-1/+1
| * | | | | | | Use DeploymentSerializer to create deployment jsonPawel Chojnacki2017-03-281-5/+2
| * | | | | | | Add endpoint that returns a list of deployments that happened within last 8.h...Pawel Chojnacki2017-03-281-0/+50
* | | | | | | | Merge branch 'dm-snippet-download-button' into 'master' Sean McGivern2017-05-021-93/+87
|\ \ \ \ \ \ \ \
| * | | | | | | | Add download button to project snippetsdm-snippet-download-buttonDouwe Maan2017-04-301-93/+87
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Display comments for personal snippets12910-personal-snippets-notes-showJarka Kadlecova2017-05-022-0/+237
|/ / / / / / /
* | | | | | | Merge branch 'enable-spec-file-name-cop' into 'master' Robert Speicher2017-04-284-67/+51
|\ \ \ \ \ \ \
| * | | | | | | Enable RSpec/FilePath copenable-spec-file-name-copSean McGivern2017-04-264-67/+51
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'dz-add-oauth-controller-spec' into 'master' Rémy Coutable2017-04-281-0/+55
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add tests for Oauth::AuthorizationsControllerdz-add-oauth-controller-specDmitriy Zaporozhets2017-04-281-0/+55
* | | | | | | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"Dosuken shinya2017-04-281-12/+354
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' int...Douwe Maan2017-04-271-4/+45
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projectsTiago Botelho2017-04-271-4/+45
* | | | | | Merge branch '12910-personal-snippet-prep-2' into 'master' Sean McGivern2017-04-263-0/+38
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Support preview_markdown action for personal_snippetsJarka Kadlecova2017-04-263-0/+38
* | | | | | Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' Sean McGivern2017-04-241-0/+15
|\ \ \ \ \ \
| * | | | | | Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-urlStan Hu2017-04-241-0/+15
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'Rémy Coutable2017-04-246-12/+0
|\ \ \ \ \ \
| * | | | | | Unnecessary "include WaitForAjax" and "include ApiHelpers"Jacopo2017-04-217-14/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'dz-fix-spec-filenames-ce' into 'master' Sean McGivern2017-04-242-47/+40
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix incorrect spec filenames which were ingored by CIdz-fix-spec-filenames-ceDmitriy Zaporozhets2017-04-242-47/+40
* | | | | | Refactor add_users method for project and groupdz-cleanup-add-usersDmitriy Zaporozhets2017-04-211-1/+1
|/ / / / /
* | | | | Refactor Admin::GroupsController#members_update method and add some specsdz-refactor-admin-group-membersDmitriy Zaporozhets2017-04-201-0/+24
* | | | | Merge branch 'dz-refactor-create-members' into 'master' Douwe Maan2017-04-201-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |