summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts/show.html.haml
Commit message (Expand)AuthorAgeFilesLines
* Add .code to all tables holding diffsDouwe Maan2019-03-261-2/+2
* Code style changes and refactorHeinrich Lee Yu2018-12-201-4/+0
* Pass in just assignees instead of issuableHeinrich Lee Yu2018-12-191-0/+4
* Refactor sidebar to use data from serializerHeinrich Lee Yu2018-12-191-1/+1
* remove merge_conflicts bundle in favor of pages directory entry pointMike Greiling2018-02-271-2/+0
* Chart.html.haml refactorJacob Schatz2018-02-191-2/+2
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-2/+2
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-0/+38