summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Fix external issue tracker "Issues" link leading to 404sfix-external-issue-tracker-linkStan Hu2016-08-251-2/+2
* Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-251-69/+0
* Fix incorrect "stopped impersonation" log messagefix-impersonation-logStan Hu2016-08-231-0/+2
* Merge branch '17932-move-to-project-dropdown' into 'master' Jacob Schatz2016-08-191-0/+50
|\
| * Move to project dropdown with infinite scroll for better performance17932-move-to-project-dropdownPaco Guzman2016-08-181-0/+50
* | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-174-0/+540
|\ \ | |/
| * Merge branch 'issue-boards' into 'master' Douwe Maan2016-08-173-0/+404
| |\
| | * Move the set up of the state described in context to a before blockDouglas Barbosa Alexandre2016-08-173-11/+21
| | * Remove # from controller actions specsDouglas Barbosa Alexandre2016-08-173-8/+8
| | * Fix matcher `match_response_schema`Douglas Barbosa Alexandre2016-08-172-3/+3
| | * Move action to render board lists to `Projects::Boards::ListsController`Douglas Barbosa Alexandre2016-08-172-51/+51
| | * Move board related controllers to the `Boards` namespaceDouglas Barbosa Alexandre2016-08-172-2/+2
| | * Rename from/to params to from_list_id/to_list_idDouglas Barbosa Alexandre2016-08-171-7/+8
| | * Add authorization to issues board related controllersDouglas Barbosa Alexandre2016-08-173-35/+134
| | * Add an endpoint to generate the default lists for a boardDouglas Barbosa Alexandre2016-08-171-0/+32
| | * Include the Issue#assignee in the response when listing issuesDouglas Barbosa Alexandre2016-08-171-1/+2
| | * Use zero-based positions on issues board servicesDouglas Barbosa Alexandre2016-08-172-10/+10
| | * Move endpoint to list issues under lists resourcesDouglas Barbosa Alexandre2016-08-171-6/+8
| | * Refactor spec for Projects::BoardListsControllerDouglas Barbosa Alexandre2016-08-171-49/+36
| | * Add endpoint to allow users to move issues between listsDouglas Barbosa Alexandre2016-08-171-10/+50
| | * Add endpoint to list issues for a specific board listDouglas Barbosa Alexandre2016-08-171-0/+46
| | * Add endpoint to allow users to remove listsDouglas Barbosa Alexandre2016-08-171-0/+34
| | * Add endpoint to allow users to move listsDouglas Barbosa Alexandre2016-08-171-0/+52
| | * Add endpoint to allow users to create a new board listDouglas Barbosa Alexandre2016-08-171-0/+49
| | * Projects::BoardsController#show returns a list of board listsDouglas Barbosa Alexandre2016-08-171-6/+33
| | * Creates a new board when project does not have oneDouglas Barbosa Alexandre2016-08-171-0/+4
| | * Initial issues board pageDouglas Barbosa Alexandre2016-08-171-0/+20
| * | Merge remote-tracking branch 'origin/master' into mc-uiSean McGivern2016-08-174-106/+296
| |\ \ | | |/
| * | Merge branch 'master' into mc-uiDouwe Maan2016-08-152-4/+6
| |\ \
| * | | Add more tests for conflictsSean McGivern2016-08-121-4/+4
| * | | Remove undo endpointSean McGivern2016-08-121-13/+0
| * | | Use same resolution format on FE and BESean McGivern2016-08-121-11/+12
| * | | REMOVE THIS COMMIT: allow undoing last resolutionSean McGivern2016-08-121-0/+13
| * | | Handle conflict resolution errors in controllerSean McGivern2016-08-121-2/+45
| * | | Allow resolving conflicts in MR controllerSean McGivern2016-08-121-6/+33
| * | | Handle multiple merge conflict files in collectionSean McGivern2016-08-121-0/+65
* | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-171-104/+188
|\ \ \ \ | | |_|/ | |/| |
| * | | Move to project dropdown with infinite scroll for better performance17932-move-to-project-dropdown-improvePaco Guzman2016-08-171-104/+188
* | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-165-6/+114
|\ \ \ \ | |/ / /
| * | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-161-0/+48
| * | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-152-2/+60
| |\ \ \ | | |_|/ | |/| |
| | * | Further refactor and syntax fixes.Patricio Cano2016-08-152-10/+5
| | * | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-152-3/+5
| | * | Allow `Issue` to be submitted as spamPatricio Cano2016-08-152-0/+41
| | * | Refactored spam related code even furtherPatricio Cano2016-08-151-1/+1
| | * | Lay the ground works to submit information to AkismetPatricio Cano2016-08-151-0/+20
| | |/
| * | This fixes a long running tests due to changed Sidekiq statefix-failing-testsKamil Trzcinski2016-08-152-4/+6
| |/
* | Address review feedbackDouwe Maan2016-08-162-79/+107
* | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-1220-64/+117
|\ \ | |/
| * Fix bug where destroying a namespace would not always destroy projectsStan Hu2016-08-112-0/+53
View Lorry Controller Status