summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests/conflicts_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Add workaround for JS error in specSean McGivern2016-08-171-1/+5
* Fix failed test because of a copy change.Fatih Acet2016-08-121-1/+1
* Add more tests for conflictsSean McGivern2016-08-121-0/+68