summaryrefslogtreecommitdiff
path: root/lib/gitlab/conflict/file_collection.rb
Commit message (Expand)AuthorAgeFilesLines
* Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-071-2/+2
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-3/+3
* Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-8/+34
* Enable and autocorrect the CustomErrorClass copSean McGivern2017-03-011-2/+1
* Allow setting content for resolutionsSean McGivern2016-10-131-0/+4
* Add more tests for conflictsSean McGivern2016-08-121-1/+1
* Move resolving code to ResolveServiceSean McGivern2016-08-121-21/+0
* Add blob_path to conflict file JSONSean McGivern2016-08-121-1/+1
* Use same resolution format on FE and BESean McGivern2016-08-121-2/+3
* Fix specsSean McGivern2016-08-121-1/+0
* Handle case where one side deleted the fileSean McGivern2016-08-121-3/+5
* Remove unneeded raiseSean McGivern2016-08-121-3/+0
* Fix MR conflict resolution commitsSean McGivern2016-08-121-1/+1
* Fix merge conflict reading for new diffsSean McGivern2016-08-121-1/+1
* Allow resolving conflicts in MR controllerSean McGivern2016-08-121-0/+20
* Handle multiple merge conflict files in collectionSean McGivern2016-08-121-0/+59