summaryrefslogtreecommitdiff
path: root/lib/gitlab/git/conflict/resolver.rb
Commit message (Expand)AuthorAgeFilesLines
* Enable even more frozen string in lib/gitlabrepo-forks/gitlab-ce-frozen-string-lib-gitlab-even-moregfyoung2018-11-131-0/+2
* Move Repository#wrapped_gitaly_errors into concernBob Van Landuyt2018-10-301-2/+4
* More Gitaly cleanup: fetch_ref, allow disk access blocksJacob Vosmaer (GitLab)2018-07-271-1/+1
* Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'ma...Jacob Vosmaer2018-07-061-65/+4
* Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"Jacob Vosmaer (GitLab)2018-07-051-4/+65
* Make more Gitaly features mandatoryJacob Vosmaer (GitLab)2018-07-041-65/+4
* 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-1/+1
* Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-111-1/+1
* Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro Rodríguez2018-01-021-7/+7
* Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro Rodríguez2017-12-271-22/+36
* Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-271-5/+19
* Simplify conflict resolver interfacegitaly-conflicts-prepAlejandro Rodríguez2017-12-141-30/+29
* Use `String#end_with?` instead of `String#ends_with?`gitaly-conflict-fileAlejandro Rodríguez2017-12-041-1/+1
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-0/+91
View Lorry Controller Status