summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests/conflicts_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Code style changes and refactorHeinrich Lee Yu2018-12-201-1/+1
* Refactor sidebar to use data from serializerHeinrich Lee Yu2018-12-191-1/+7
* Enable even more frozen string in app/controllersgfyoung2018-09-251-0/+2
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-1/+1
* Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-1/+1
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-1/+1
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-0/+66