summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/conflict
Commit message (Expand)AuthorAgeFilesLines
* Fix merge conflict size limitfix-allowed-conflict-sizeSean McGivern2016-09-071-2/+2
* Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-251-0/+5
* Find match line headers by backtrackingSean McGivern2016-08-121-0/+104
* Add more tests for conflictsSean McGivern2016-08-122-5/+5
* Clarify Conflict::File#sections methodSean McGivern2016-08-121-11/+12
* Add blob_icon to conflict file JSONSean McGivern2016-08-121-0/+4
* Add blob_path to conflict file JSONSean McGivern2016-08-121-1/+9
* Use same resolution format on FE and BESean McGivern2016-08-121-2/+2
* Fix specsSean McGivern2016-08-121-3/+2
* Raise errors for large and binary filesSean McGivern2016-08-121-9/+17
* Auto-highlight conflict when rich_text is calledSean McGivern2016-08-121-5/+11
* Allow resolving conflicts in MR controllerSean McGivern2016-08-121-0/+66
* Handle multiple merge conflict files in collectionSean McGivern2016-08-123-12/+35
* Add backend for merge conflicts readingSean McGivern2016-08-122-0/+254