summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/conflicts
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-4-stable-eeGitLab Bot2020-09-191-2/+1
* Add latest changes from gitlab-org/gitlab@13-3-stable-eeGitLab Bot2020-08-201-0/+1
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-202-2/+3
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-171-1/+3
* Add frozen_string_literal to spec/servicesfrozen_string_literal_spec_servicesThong Kuah2019-04-122-0/+4
* Make sure ConflictsService does not raise for conflicting submodulesSean McGivern2018-07-101-2/+8
* Updates from `rubocop -a`Lin Jen-Shin2018-07-091-1/+1
* Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'ma...Jacob Vosmaer2018-07-062-29/+0
* Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"Jacob Vosmaer (GitLab)2018-07-052-0/+29
* Make more Gitaly features mandatoryJacob Vosmaer (GitLab)2018-07-042-29/+0
* Add cannot_be_merged_recheck merge_statuslulalala2018-05-171-1/+1
* Fix 500 error when MR from fork has conflicts but worker has not runfix-500-error-when-mr-ref-is-not-yet-fetchedSean McGivern2018-04-061-0/+16
* Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-272-17/+29
* 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-122-14/+21
* 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
* Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-181-0/+7
* Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-122-0/+295
View Lorry Controller Status