summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-042-16/+118
|\
| * Fix rubocop error31050-registry-image-listsFilipa Lacerda2017-10-031-1/+1
| * Fix rubocop failuresKamil Trzcinski2017-10-031-8/+8
| * Add serializer matchersKamil Trzcinski2017-10-022-16/+118
* | Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'Douwe Maan2017-10-041-12/+0
|\ \
| * | Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvementsOswaldo Ferreira2017-10-041-12/+0
| |/
* | Resolve "Precompiled assets with digest strings are ignored in CI"Mike Greiling2017-10-033-3/+3
* | Merge branch '36670-remove-edit-form' into 'master'Sean McGivern2017-10-031-179/+140
|\ \
| * | refactor issues_controller_spec `update` actionJarka Kadlecova2017-10-031-157/+140
| * | Remove edit action for issuesJarka Kadlecova2017-10-031-29/+7
| |/
* | Merge branch 'sh-improve-perf-notes-actions' into 'master'Douwe Maan2017-10-031-0/+34
|\ \
| * | Improve performance of filtering notes in NotesControllersh-improve-perf-notes-actionsStan Hu2017-10-021-0/+34
| |/
* | Pulling merge_method spec for project_controller_spec from EE[ci skip]Valery Sizov2017-09-201-0/+18
|/
* Fix the filesystem shard health check to check all configured shardsNick Thomas2017-09-191-0/+1
* Merge branch 'zj-update-project-settings' into 'master'Grzegorz Bizon2017-09-191-0/+43
|\
| * Fix instance default option being true as valueZeger-Jan van de Weg2017-09-181-1/+13
| * Allow updating of project auto devops settingsZeger-Jan van de Weg2017-09-151-0/+31
* | Eliminate N+1 queries in loading discussions.json endpointsh-optimize-discussion-jsonStan Hu2017-09-181-0/+32
|/
* Merge branch '34510-board-issues-sql-speedup' into 'master'Douwe Maan2017-09-141-0/+11
|\
| * fix another N+1 query for label priorities34510-board-issues-sql-speedupmicael.bergeron2017-09-121-0/+11
* | Merge branch 'revert-2f46c3a8' into 'master'Robert Speicher2017-09-121-2/+4
|\ \ | |/ |/|
| * Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-2/+4
* | Resolve "Error 500 in non-UTF8 branch names"Micael Bergeron2017-09-121-0/+15
|/
* Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-081-4/+2
* Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-falseRuben Davila2017-09-071-0/+124
* Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'...Sean McGivern2017-09-071-2/+4
|\
| * Restore some changes from !9199Rubén Dávila2017-09-061-2/+4
* | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-072-10/+24
|\ \ | |/ |/|
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba...Simon Knox2017-09-0611-147/+352
| |\
| * | Backport specsFelipe Artur2017-08-312-10/+24
| * | Continue BE backportFelipe Artur2017-08-312-0/+0
* | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-061-0/+22
|\ \ \
| * | | add controller specmicael.bergeron2017-09-061-0/+22
| | |/ | |/|
* | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-061-8/+0
|\ \ \
| * \ \ Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into feature/gb/downl...Grzegorz Bizon2017-09-061-0/+82
| |\ \ \ | | |/ /
| * | | Fix artifacts controller specsGrzegorz Bizon2017-09-061-8/+0
* | | | Profile updates from providersAlexander Keramidas2017-09-061-1/+24
| |/ / |/| |
* | | Re-use issue/MR counts for the pagination systemmr-index-page-performanceYorick Peterse2017-09-051-0/+82
|/ /
* | Move "Move to different project" to sidebar34261-move-move-to-sidebarEric Eastwood2017-09-032-117/+120
* | Merge branch 'issue-discussions-refactor' into 'master'Jacob Schatz2017-09-022-5/+27
|\ \
| * \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-312-13/+32
| |\ \
| * | | Fix specsDouwe Maan2017-08-301-5/+12
| * | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-305-8/+63
| |\ \ \
| * \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-231-10/+32
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-173-8/+10
| |\ \ \ \ \
| * | | | | | fix static_analysis (rubocop)Jarka Kadlecova2017-08-141-2/+1
| * | | | | | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-125-81/+190
| |\ \ \ \ \ \
| * | | | | | | Use UserNoteEntity instead of UserEntity for notesJarka Kadlecova2017-08-111-0/+16
* | | | | | | | Merge branch '37202-revert-changes-to-signing-enabled' into 'master'Douwe Maan2017-09-012-6/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Rollsback changes made to signing_enabled.Tiago Botelho2017-09-012-6/+15
| | |_|_|/ / / / | |/| | | | | |