summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/conflict/file_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Use described_class when possibleRémy Coutable2017-07-271-2/+2
* Remove superfluous lib: true, type: redis, service: true, models: true, servi...Rémy Coutable2017-07-271-1/+1
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-12/+12
* Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-231-1/+1
* Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-12/+12
* Enable Style/WordArrayDouwe Maan2017-02-231-2/+2
* Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-12/+12
* Use `:empty_project` where possible throughout spec/librs-empty_project-libRobert Speicher2017-01-251-1/+1
* Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+11
* Find match line headers by backtrackingSean McGivern2016-08-121-0/+104
* Add more tests for conflictsSean McGivern2016-08-121-3/+3
* 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
* 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-121-8/+5
* Add backend for merge conflicts readingSean McGivern2016-08-121-0/+76