diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/gitlab/gitaly_client/remote_service.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/gitlab/gitaly_client/remote_service.rb')
-rw-r--r-- | lib/gitlab/gitaly_client/remote_service.rb | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/gitlab/gitaly_client/remote_service.rb b/lib/gitlab/gitaly_client/remote_service.rb index 04dd394a2bd..1f360385111 100644 --- a/lib/gitlab/gitaly_client/remote_service.rb +++ b/lib/gitlab/gitaly_client/remote_service.rb @@ -45,18 +45,9 @@ module Gitlab # The remote_name parameter is deprecated and will be removed soon. def find_remote_root_ref(remote_name, remote_url, authorization) - request = if Feature.enabled?(:find_remote_root_refs_inmemory, default_enabled: :yaml) - Gitaly::FindRemoteRootRefRequest.new( - repository: @gitaly_repo, - remote_url: remote_url, - http_authorization_header: authorization - ) - else - Gitaly::FindRemoteRootRefRequest.new( - repository: @gitaly_repo, - remote: remote_name - ) - end + request = Gitaly::FindRemoteRootRefRequest.new(repository: @gitaly_repo, + remote_url: remote_url, + http_authorization_header: authorization) response = GitalyClient.call(@storage, :remote_service, :find_remote_root_ref, request, timeout: GitalyClient.medium_timeout) |