summaryrefslogtreecommitdiff
path: root/lib/gitlab/gitaly_client/conflicts_service.rb
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-181-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-191-1/+1
* Force source and target branch to binary modesh-fix-utf-8-encoding-resolve-conflictsStan Hu2019-06-101-2/+2
* Fix UTF-8 conversion issues when resolving conflictsStan Hu2019-06-101-1/+1
* Allow streaming io objects into GitalyBob Van Landuyt2019-04-011-1/+1
* Enable even more frozen string in lib/gitlabrepo-forks/gitlab-ce-frozen-string-lib-gitlab-even-moregfyoung2018-11-131-0/+2
* Make sure ConflictsService does not raise for conflicting submodulesSean McGivern2018-07-101-4/+6
* Updated Gitaly timeout valuesAndrew Newdigate2018-07-051-1/+1
* GitalyClient::ConflictsService#conflicts? should return true for conflicts wi...fix/gitaly-can-be-merged-for-missing-conflict-filesAhmad Sherif2018-01-231-0/+5
* Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-111-33/+5
* Fix method lookupfix-encoding-method-lookupJacob Vosmaer2018-01-031-1/+3
* Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro Rodríguez2018-01-021-40/+35
* Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro Rodríguez2017-12-271-4/+42
* Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-271-0/+60
View Lorry Controller Status