kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'gitaly-remove-fetch-ref' into 'master'

Browse source 
Annotate Gitlab::Git::Repository#fetch_ref

See merge request gitlab-org/gitlab-ce!20742
This commit is contained in:
Sean McGivern 2018-07-24 06:33:55 +00:00
commit 9cf57400c5
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/gitlab/git/repository.rb
View file

@ -826,6 +826,10 @@ module Gitlab
end end
end end
# This method, fetch_ref, is used from within
# Gitlab::Git::OperationService. OperationService will eventually only
# exist in gitaly-ruby. When we delete OperationService from gitlab-ce
# we can also remove fetch_ref.
def fetch_ref(source_repository, source_ref:, target_ref:) def fetch_ref(source_repository, source_ref:, target_ref:)
Gitlab::Git.check_namespace!(source_repository) Gitlab::Git.check_namespace!(source_repository)
source_repository = RemoteRepository.new(source_repository) unless source_repository.is_a?(RemoteRepository) source_repository = RemoteRepository.new(source_repository) unless source_repository.is_a?(RemoteRepository)

1
lib/gitlab/import_export/merge_request_parser.rb
View file

@ -25,6 +25,7 @@ module Gitlab
@project.repository.create_branch(@merge_request.target_branch, @merge_request.target_branch_sha) @project.repository.create_branch(@merge_request.target_branch, @merge_request.target_branch_sha)
end end
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1295
def fetch_ref def fetch_ref
@project.repository.fetch_ref(@project.repository, source_ref: @diff_head_sha, target_ref: @merge_request.source_branch) @project.repository.fetch_ref(@project.repository, source_ref: @diff_head_sha, target_ref: @merge_request.source_branch)
end end