summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Improve create project member test at project_members_controller_specDmitriy Zaporozhets2016-10-241-25/+16
* Refactor create member tests from group_members_controller_specDmitriy Zaporozhets2016-10-241-41/+30
* Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-242-0/+111
* Fix status code expectationRémy Coutable2016-10-221-1/+1
* Fix error in generating labelssh-fix-broken-label-controllerStan Hu2016-10-221-0/+15
* Merge branch 'fix_project_member_access_levels' into 'master' Sean McGivern2016-10-211-0/+36
|\
| * Fix project member access levelsfix_project_member_access_levelsValery Sizov2016-10-211-0/+36
* | Merge branch 'zj-use-iid-deployment-refs' into 'master' Kamil Trzciński2016-10-201-1/+1
|\ \ | |/ |/|
| * Use deployment IID when saving refsZ.J. van de Weg2016-10-201-1/+1
* | Merge branch 'feature/group-level-labels' into 'master' Douwe Maan2016-10-191-20/+41
|\ \
| * | Fix sorting by label prioritiesDouglas Barbosa Alexandre2016-10-191-12/+19
| * | Remove scopes/types for labelsDouglas Barbosa Alexandre2016-10-191-32/+6
| * | Remove project_labels from Projects::ApplicationControllerDouglas Barbosa Alexandre2016-10-191-20/+60
* | | Change the order of tested methods in project_members_controller_specDmitriy Zaporozhets2016-10-191-44/+44
* | | Refactor project_members_controller_specdz-refactor-project-members-controller-specDmitriy Zaporozhets2016-10-191-78/+35
|/ /
* | Refactor group_members_controller_specdz-refactor-some-specsDmitriy Zaporozhets2016-10-191-86/+34
|/
* Merge branch 'master' into issue_19734_2Phil Hughes2016-10-181-9/+164
|\
| * Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-0/+30
| |\
| * | Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+1
| * | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-131-0/+1
| * | Add JSON SchemaSean McGivern2016-10-131-0/+4
| * | Make RuboCop happySean McGivern2016-10-131-1/+0
| * | Allow setting content for resolutionsSean McGivern2016-10-131-9/+159
* | | Add visibility level to project repositoryissue_19734_2Felipe Artur2016-10-171-0/+40
| |/ |/|
* | Add test, fix merge errorzj-show-deployed-time-agoZ.J. van de Weg2016-10-141-0/+30
|/
* Merge branch 'use-language-colours-for-graph' into 'master' Sean McGivern2016-10-131-0/+44
|\
| * Fix indentation and change inner matcherGeorg G2016-10-131-5/+5
| * Use test double and matchersGeorg G2016-10-131-6/+7
| * Add spec for Projects::GraphsController#languagesGeorg G2016-10-121-0/+43
* | Merge branch 'feature/issues-board' into 'master' Sean McGivern2016-10-133-58/+153
|\ \
| * | Update board specs to use board factory instead of project_with_boardDouglas Barbosa Alexandre2016-10-111-2/+2
| * | Refactoring service to create a new issue in a board listDouglas Barbosa Alexandre2016-10-111-6/+7
| * | Fix rubocop offensesDouglas Barbosa Alexandre2016-10-111-1/+1
| * | Update endpoints to handle with board issuesDouglas Barbosa Alexandre2016-10-111-15/+38
| * | Update endpoints to handle with board list changesDouglas Barbosa Alexandre2016-10-111-26/+31
| * | Update Projects::BoardsController#show to look up for a specific boardDouglas Barbosa Alexandre2016-10-111-9/+28
| * | Add index action to Projects::BoardsController to return project boardsDouglas Barbosa Alexandre2016-10-111-0/+47
* | | Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' Douwe Maan2016-10-121-6/+10
|\ \ \
| * | | refactors tests because of gitlab-test repository changes20708-new-branch-is-immediatelly-tagged-as-mergedtiagonbotelho2016-10-111-6/+10
| | |/ | |/|
* | | Merge branch '22211-500-instead-of-404' into 'master' Sean McGivern2016-10-111-0/+14
|\ \ \
| * \ \ Merge branch 'master' into 22211-500-instead-of-404Linus G Thiel2016-10-115-129/+95
| |\ \ \ | | | |/ | | |/|
| * | | Respond with 404 Not Found for non-existent tagsLinus G Thiel2016-10-051-0/+14
* | | | Merge branch 'assign-issues-for-merge-request-18876' into 'master' Douwe Maan2016-10-111-0/+48
|\ \ \ \
| * | | | fixup! Added link to bulk assign issues to MR author. (Issue #18876)James Edwards-Jones2016-10-101-1/+1
| * | | | fixup! Added link to bulk assign issues to MR author. (Issue #18876)James Edwards-Jones2016-10-071-0/+17
| * | | | Added link to bulk assign issues to MR author. (Issue #18876)James2016-10-061-0/+31
* | | | | Merge branch 'atom-routes' into 'master' Robert Speicher2016-10-111-9/+32
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Allow browsing branches that end with '.atom'Sean McGivern2016-10-111-9/+32
| | |_|/ | |/| |
* | | | Merge branch 'dz-cleanup-routing' into 'master' Dmitriy Zaporozhets2016-10-111-118/+0
|\ \ \ \
| * | | | Remove NamespacesControllerDmitriy Zaporozhets2016-10-101-118/+0
| |/ / /
View Lorry Controller Status