diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-07-20 15:41:36 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-07-20 15:41:36 +0200 |
| commit | a36cbe3c17a7dbbfd5d8796098cb877a4ca99b4c (patch) | |
| tree | 45d668bd12886c9f8f029bcffa32a81fa442b977 | |
| parent | eb853da8715bab7bc66d102c648508b0294d7597 (diff) | |
| download | gitlab-ce-gitaly-remove-fetch-ref.tar.gz | |
restore methodgitaly-remove-fetch-ref
| -rw-r--r-- | app/models/repository.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/import_export/merge_request_parser.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 03cfbeba71a..e248f94cbd8 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -964,6 +964,10 @@ class Repository blob_data_at(sha, '.lfsconfig') end + def fetch_ref(source_repository, source_ref:, target_ref:) + raw_repository.fetch_ref(source_repository.raw_repository, source_ref: source_ref, target_ref: target_ref) + end + def rebase(user, merge_request) raw.rebase(user, merge_request.id, branch: merge_request.source_branch, branch_sha: merge_request.source_branch_sha, diff --git a/lib/gitlab/import_export/merge_request_parser.rb b/lib/gitlab/import_export/merge_request_parser.rb index f3d7407383c..d0527f014a7 100644 --- a/lib/gitlab/import_export/merge_request_parser.rb +++ b/lib/gitlab/import_export/merge_request_parser.rb @@ -25,6 +25,7 @@ module Gitlab @project.repository.create_branch(@merge_request.target_branch, @merge_request.target_branch_sha) end + # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1295 def fetch_ref @project.repository.fetch_ref(@project.repository, source_ref: @diff_head_sha, target_ref: @merge_request.source_branch) end |