summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/conflicts/resolve_service_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'ma...Jacob Vosmaer2018-07-061-11/+0
* Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"Jacob Vosmaer (GitLab)2018-07-051-0/+11
* Make more Gitaly features mandatoryJacob Vosmaer (GitLab)2018-07-041-11/+0
* Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-271-9/+11
* Simplify conflict resolver interfacegitaly-conflicts-prepAlejandro Rodríguez2017-12-141-1/+1
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-6/+6
* Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-13/+20
* Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-121-1/+1
* 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