summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@12-5-stable-eeGitLab Bot2019-11-191-0/+2
* Add latest changes from gitlab-org/gitlab@12-4-stable-eeGitLab Bot2019-10-221-1/+1
* Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-111-0/+54