summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-04-09 09:32:58 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-04-09 09:32:58 +0000
commita2a6a5cab66c2cfec6b770d070187badfd505b62 (patch)
tree51041f2a47db34e9511587d07f249fd6f25273f8 /lib
parentfb0bb32f25cdda752d340316c52ba9a47b346ade (diff)
parent4ca00b52cde866aff974dd8f5c840796598af605 (diff)
downloadgitlab-ce-a2a6a5cab66c2cfec6b770d070187badfd505b62.tar.gz
Merge branch 'zj-find-license-opt-out' into 'master'
Move FindLicense RPC to OPT OUT status See merge request gitlab-org/gitlab-ce!18228
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/repository.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 79cacd9f6f5..f1b575bd872 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1045,7 +1045,8 @@ module Gitlab
end
def license_short_name
- gitaly_migrate(:license_short_name) do |is_enabled|
+ gitaly_migrate(:license_short_name,
+ status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled
gitaly_repository_client.license_short_name
else