Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/conflicts
AgeCommit message (Expand)Author
2020-01-18Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-04-12Add frozen_string_literal to spec/servicesThong Kuah
2018-07-10Make sure ConflictsService does not raise for conflicting submodulesSean McGivern
2018-07-09Updates from `rubocop -a`Lin Jen-Shin
2018-07-06Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'ma...Jacob Vosmaer
2018-07-05Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"Jacob Vosmaer (GitLab)
2018-07-04Make more Gitaly features mandatoryJacob Vosmaer (GitLab)
2018-05-17Add cannot_be_merged_recheck merge_statuslulalala
2018-04-06Fix 500 error when MR from fork has conflicts but worker has not runSean McGivern
2017-12-27Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez
2017-12-14Simplify conflict resolver interfaceAlejandro Rodríguez
2017-10-13Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez
2017-10-13Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez
2017-10-13Encapsulate git operations for conflict resolution into libAlejandro Rodríguez
2017-10-11Backport EE change for setting up forked projectLin Jen-Shin
2017-10-07Add a project forks spec helperBob Van Landuyt
2017-06-21Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon
2017-06-01Keep trailing newline when picking conflict sectionsSean McGivern
2017-05-18Stop MR conflict code from blowing up when branches are missingDouwe Maan
2017-05-12Fix conflict resolution from corrupted upstreamSean McGivern
    generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 12:15:49 +0300