summaryrefslogtreecommitdiff
path: root/spec/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Add helper method to toggle label subscription on labels controller specDouglas Barbosa Alexandre2016-11-151-2/+6
* Remove default value for `project` argument on subscribable concernDouglas Barbosa Alexandre2016-11-151-1/+1
* Allow users to subscribe to group labels at project-levelDouglas Barbosa Alexandre2016-11-151-7/+19
* Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-151-4/+54
|\
| * Add button to delete all merged branchesToon Claes2016-11-091-4/+54
* | Ensure labels are loaded on "show" methods of MRAlex Sanford2016-11-111-0/+25
|/
* Complete and improve specsRémy Coutable2016-11-041-14/+54
* Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-041-0/+26
* Implement CreateMembers service to make controller thinrefactor_group_membersValery Sizov2016-11-011-34/+34
* Merge branch '23106-events-default-scope-results-in-a-slow-query' into 'master' Yorick Peterse2016-10-311-1/+1
|\
| * Optimize Event queries by removing default order23106-events-default-scope-results-in-a-slow-queryAlejandro Rodríguez2016-10-271-1/+1
* | Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-createAdam Niedzielski2016-10-281-5/+16
|/
* Merge branch 'master' into issue-board-sidebarissue-board-sidebarPhil Hughes2016-10-263-1/+100
|\
| * Improve create project member test at project_members_controller_specDmitriy Zaporozhets2016-10-241-25/+16
| * Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-241-0/+57
| * 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 'master' into issue-board-sidebarPhil Hughes2016-10-192-139/+117
|\ \ \ | |/ /
| * | 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
| |/
* | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-199-83/+495
|\ \ | |/
| * Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-0/+30
| |\
| | * Add test, fix merge errorzj-show-deployed-time-agoZ.J. van de Weg2016-10-141-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
| |/
| * 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
| | | |/ | | |/|
View Lorry Controller Status