summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '20808-merge-request-new-diff-view' into 'master' Robert Speicher2016-08-171-0/+2
|\
| * Fix merge request new view not changing code view rendering style20808-merge-request-new-diff-viewPaco Guzman2016-08-111-0/+2
* | Merge branch 'issue-boards' into 'master' Douwe Maan2016-08-175-0/+232
|\ \
| * | Returns label priority in JSON when listing lists/issuesDouglas Barbosa Alexandre2016-08-171-0/+65
| * | Use IssuesFinder instead of project.issues.visible_to_userDouglas Barbosa Alexandre2016-08-171-1/+5
| * | Add a movable scope and a movable? method to List modelDouglas Barbosa Alexandre2016-08-171-2/+2
| * | Add a destroyable scope and a destroyable? method to List modelDouglas Barbosa Alexandre2016-08-171-7/+4
| * | Remove lookup inside services to keep them consistent with other onesDouglas Barbosa Alexandre2016-08-172-5/+14
| * | Extract method to serialize board lists as JSONDouglas Barbosa Alexandre2016-08-171-3/+12
| * | Move action to render board lists to `Projects::Boards::ListsController`Douglas Barbosa Alexandre2016-08-172-13/+14
| * | Extract `Projects::Boards::ApplicationController`Douglas Barbosa Alexandre2016-08-173-18/+17
| * | Move board related controllers to the `Boards` namespaceDouglas Barbosa Alexandre2016-08-174-117/+125
| * | Rename from/to params to from_list_id/to_list_idDouglas Barbosa Alexandre2016-08-171-1/+1
| * | Returns label description in JSON when listing lists/issuesDouglas Barbosa Alexandre2016-08-173-4/+4
| * | Returns label priority in JSON when listing lists/issuesDouglas Barbosa Alexandre2016-08-173-4/+4
| * | Add authorization to issues board related controllersDouglas Barbosa Alexandre2016-08-173-0/+30
| * | Add an endpoint to generate the default lists for a boardDouglas Barbosa Alexandre2016-08-171-0/+10
| * | Include the Issue#assignee in the response when listing issuesDouglas Barbosa Alexandre2016-08-171-1/+6
| * | Return Issue#iid instead of id when listing issuesDouglas Barbosa Alexandre2016-08-171-1/+1
| * | Move endpoint to list issues under lists resourcesDouglas Barbosa Alexandre2016-08-171-1/+1
| * | Add endpoint to allow users to move issues between listsDouglas Barbosa Alexandre2016-08-171-0/+14
| * | Extract base service class for boards related servicesDouglas Barbosa Alexandre2016-08-172-4/+4
| * | Add endpoint to list issues for a specific board listDouglas Barbosa Alexandre2016-08-171-0/+22
| * | Handle formats at the controller level in Projects::BoardListsControllerDouglas Barbosa Alexandre2016-08-171-22/+18
| * | Add endpoint to allow users to remove listsDouglas Barbosa Alexandre2016-08-171-0/+12
| * | Add endpoint to allow users to move listsDouglas Barbosa Alexandre2016-08-171-0/+22
| * | Add endpoint to allow users to create a new board listDouglas Barbosa Alexandre2016-08-171-0/+19
| * | Projects::BoardsController#show returns a list of board listsDouglas Barbosa Alexandre2016-08-171-1/+2
| * | Creates a new board when project does not have oneDouglas Barbosa Alexandre2016-08-171-0/+2
| * | Initial issues board pageDouglas Barbosa Alexandre2016-08-171-0/+7
* | | Merge branch 'mc-ui'Douwe Maan2016-08-171-5/+52
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into mc-uiSean McGivern2016-08-174-10/+38
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into mc-uiDouwe Maan2016-08-153-5/+34
| |\ \ \
| * | | | Use a regular flash message after resolution is completeDouwe Maan2016-08-121-2/+1
| * | | | Prevent “This merge request contains merge conflicts” from being shown af...Douwe Maan2016-08-121-1/+1
| * | | | Get conflict resolution to work for MRs from forksDouwe Maan2016-08-121-1/+1
| * | | | Show appropriate message when conflicts have already been resolvedDouwe Maan2016-08-121-1/+13
| * | | | Verify user is signed in and can actually resolve conflictsDouwe Maan2016-08-121-0/+6
| * | | | Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?`Douwe Maan2016-08-121-1/+1
| * | | | Add more tests for conflictsSean McGivern2016-08-121-1/+1
| * | | | Set flash message after conflict is resolvedSean McGivern2016-08-121-1/+4
| * | | | Remove undo endpointSean McGivern2016-08-121-12/+1
| * | | | Move resolving code to ResolveServiceSean McGivern2016-08-121-1/+1
| * | | | Don't allow resolving invalid conflictsSean McGivern2016-08-121-6/+4
| * | | | Fix resolve_conflicts endpointSean McGivern2016-08-121-3/+2
| * | | | Make SCSS lint and RuboCop happySean McGivern2016-08-121-1/+1
| * | | | Render right sidebar and handle request error.Fatih Acet2016-08-121-1/+4
| * | | | Handle case where one side deleted the fileSean McGivern2016-08-121-1/+1
| * | | | Remove Conflicts tab make it a page instead.Fatih Acet2016-08-121-4/+1
| * | | | REMOVE THIS COMMIT: allow undoing last resolutionSean McGivern2016-08-121-1/+12
View Lorry Controller Status