summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-111-0/+54