diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-08-23 17:14:21 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-08-31 15:35:59 +0200 |
| commit | 8ad690b0d4f9db528c40e7f523e6f8219c944d48 (patch) | |
| tree | cafe45b09c7f18a196b69897a77387b19cfaaff1 /lib/gitlab/conflict | |
| parent | 3e092caa91853afeab3bb01be10869e45c39de5d (diff) | |
| download | gitlab-ce-8ad690b0d4f9db528c40e7f523e6f8219c944d48.tar.gz | |
Prepare GitOperationService for move to Gitlab::Git
Diffstat (limited to 'lib/gitlab/conflict')
| -rw-r--r-- | lib/gitlab/conflict/file_collection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/conflict/file_collection.rb b/lib/gitlab/conflict/file_collection.rb index d671867e7c7..90f83e0f810 100644 --- a/lib/gitlab/conflict/file_collection.rb +++ b/lib/gitlab/conflict/file_collection.rb @@ -18,7 +18,7 @@ module Gitlab new(merge_request, project).tap do |file_collection| project .repository - .with_repo_branch_commit(merge_request.target_project.repository, merge_request.target_branch) do + .with_repo_branch_commit(merge_request.target_project.repository.raw_repository, merge_request.target_branch) do yield file_collection end |