Commit 54229d3e authored by Stan Hu's avatar Stan Hu

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

Fix feature flags for Gitaly's RemoteService RPCs

See merge request gitlab-org/gitlab-ce!16150
parents f1d5e509 04b98756
...@@ -919,7 +919,7 @@ module Gitlab ...@@ -919,7 +919,7 @@ module Gitlab
# If `mirror_refmap` is present the remote is set as mirror with that mapping # If `mirror_refmap` is present the remote is set as mirror with that mapping
def add_remote(remote_name, url, mirror_refmap: nil) 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 if is_enabled
gitaly_remote_client.add_remote(remote_name, url, mirror_refmap) gitaly_remote_client.add_remote(remote_name, url, mirror_refmap)
else else
...@@ -929,7 +929,7 @@ module Gitlab ...@@ -929,7 +929,7 @@ module Gitlab
end end
def remove_remote(remote_name) 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 if is_enabled
gitaly_remote_client.remove_remote(remote_name) gitaly_remote_client.remove_remote(remote_name)
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment