diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-12-27 20:54:34 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-12-27 20:54:34 +0000 |
| commit | 54229d3e45576c50e192af79bebbd8e893a3c28e (patch) | |
| tree | cd98fa6459509caa95854ba8592a0f5a5d6cb4c1 | |
| parent | f1d5e509b52c8c05fd570503389930121e12d87f (diff) | |
| parent | 04b987563a55357669f3814324391c7eddd3e2f4 (diff) | |
| download | gitlab-ce-54229d3e45576c50e192af79bebbd8e893a3c28e.tar.gz | |
Merge branch 'gitaly-remotes-fix' into 'master'
Fix feature flags for Gitaly's RemoteService RPCs
See merge request gitlab-org/gitlab-ce!16150
| -rw-r--r-- | lib/gitlab/git/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 36dc6b820ce..a09386d52a5 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -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 |