summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-161-2/+8
* Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'Douwe Maan2017-08-152-6/+6
* Merge branch '35435-pending-delete-project-error-in-admin-interface-fix' into...Douwe Maan2017-08-151-0/+12
* Revert "Merge branch 'split-events-into-push-events' into 'master'"Jose Ivan Vargas2017-08-111-8/+2
* Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-111-2/+8
* Merge branch 'master' into ideMike Greiling2017-08-074-1/+64
|\
| * Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-043-0/+63
| * fix #3686 make tarball download url to end with extensionhaseeb2017-08-031-1/+1
* | Fix blob_controller_spec plain to raw_pathLuke "Jared" Bennett2017-08-041-1/+1
* | Merge branch 'master' into ideDouwe Maan2017-08-0360-140/+109
|\ \ | |/
| * Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-0260-97/+97
| * Merge branch 'rs-issuables-list-metadata-shared-examples' into 'master'Rémy Coutable2017-08-021-1/+3
| |\
| | * Make the 'issuables list meta-data' shared example less dangerousrs-issuables-list-metadata-shared-examplesRobert Speicher2017-08-011-1/+3
| * | Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-0113-33/+33
| |/
| * Merge branch '28283-legacy-storage-format' into 'master'Sean McGivern2017-08-014-8/+8
| |\
| | * Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-014-8/+8
| * | Add option to use CommitLanguages RPCJacob Vosmaer2017-08-011-33/+0
| |/
* | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-311-1/+61
|\ \ | |/
| * Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan2017-07-281-1/+61
| |\
| | * Fix replying to commit comments on MRs from forksSean McGivern2017-07-281-1/+61
* | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-2811-37/+119
|\ \ \ | |/ /
| * | Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into...Tim Zallmann2017-07-281-2/+2
| |\ \
| | * | fix broken testsMike Greiling2017-07-191-2/+2
| * | | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-272-4/+9
| | |/ | |/|
| * | Remove superfluous type defs in specsKeifer Furzland2017-07-271-1/+1
| * | Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' int...Sean McGivern2017-07-261-0/+21
| |\ \
| | * | Fixes 500 error caused by pending delete projects in admin dashboard35453-pending-delete-projects-error-in-admin-dashboard-fixTiago Botelho2017-07-251-0/+21
| * | | Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-252-3/+8
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-207-14/+126
| | |\ \ \
| | * | | | Instead of adding master, stub_not_protect_default_branchLin Jen-Shin2017-07-182-6/+11
| | * | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-1734-207/+866
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Update tests due to permission changesLin Jen-Shin2017-07-042-9/+9
| * | | | | Merge branch 'dz-update-shoulda' into 'master'Rémy Coutable2017-07-253-5/+5
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Remove unnecessary set_flash.now from controller specsDmitriy Zaporozhets2017-07-243-5/+5
| * | | | | Associate Issues tab only with internal issues trackerJarka Kadlecova2017-07-241-19/+40
| |/ / / /
| * | | | Merge branch 'zj-pipeline-badge-improvements' into 'master'Grzegorz Bizon2017-07-221-0/+28
| |\ \ \ \
| | * | | | Rename build to pipeline for status badgesZ.J. van de Weg2017-07-211-0/+28
| * | | | | Merge branch '34549-extract-devise-mappings-into-helper' into 'master'Rémy Coutable2017-07-211-3/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test h...Jacopo2017-07-201-3/+5
* | | | | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-2046-786/+1868
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Wrong data type when testing webhooksAlexander Randa2017-07-201-0/+21
| | |_|_|/ | |/| | |
| * | | | Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'Kamil Trzciński2017-07-201-0/+48
| |\ \ \ \
| | * | | | Fix docker tag reference routing constraintsGrzegorz Bizon2017-07-191-0/+48
| | | |_|/ | | |/| |
| * | | | Merge branch '33303-404-for-unauthorized-project' into 'security-9-3'Sean McGivern2017-07-191-0/+30
| * | | | Merge branch '33359-pers-snippet-files-location' into 'security-9-3'Sean McGivern2017-07-192-6/+6
| * | | | Merge branch '34930-fix-edited-by' into 'master'Sean McGivern2017-07-191-0/+30
| |\ \ \ \
| | * | | | Use Ghost user when edited_by, merged_by deleted34930-fix-edited-byJarka Kadlecova2017-07-191-0/+30
| | |/ / /
| * | | | Merge branch 'authentiq-updates' into 'master'Rémy Coutable2017-07-191-1/+1
| |\ \ \ \
| | * | | | Added authentiq provider to tests and updated documentation, gem and config f...Alexandros Keramidas2017-07-181-1/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'issue_35132' into 'master'Sean McGivern2017-07-191-6/+10
| |\ \ \ \
View Lorry Controller Status