summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/conflicts/list_service.rb
Commit message (Expand)AuthorAgeFilesLines
* Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-181-0/+1
* Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-0/+35