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

Merge branch 'gitaly-remotes-fix' into 'master' 

Fix feature flags for Gitaly's RemoteService RPCs

See merge request gitlab-org/gitlab-ce!16150
This commit is contained in:
Stan Hu 2017-12-27 20:54:34 +00:00
parent f1d5e509b5 04b987563a
commit 54229d3e45
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -919,7 +919,7 @@ module Gitlab
# If `mirror_refmap` is present the remote is set as mirror with that mapping
def add_remote(remote_name, url, mirror_refmap: nil)
gitaly_migrate(:operation_user_add_tag) do |is_enabled|
gitaly_migrate(:remote_add_remote) do |is_enabled|
if is_enabled
gitaly_remote_client.add_remote(remote_name, url, mirror_refmap)
else
@ -929,7 +929,7 @@ module Gitlab
end
def remove_remote(remote_name)
gitaly_migrate(:operation_user_add_tag) do |is_enabled|
gitaly_migrate(:remote_remove_remote) do |is_enabled|
if is_enabled
gitaly_remote_client.remove_remote(remote_name)
else