summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/conflicts/resolve_service_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Backport EE change for setting up forked projectbackport-ee-change-for-testLin Jen-Shin2017-10-111-5/+1
* Add a project forks spec helperBob Van Landuyt2017-10-071-9/+11
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-15/+14
* Keep trailing newline when picking conflict sections32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-fileSean McGivern2017-06-011-3/+39
* Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-0/+222