summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-04-06 16:13:01 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-04-06 16:13:01 +0200
commit4ca00b52cde866aff974dd8f5c840796598af605 (patch)
treefe7055df713fe3c36b44887aea7710a73017ee1c
parent997c9006d63a3fd8ffe264dec0cff2cb935904ef (diff)
downloadgitlab-ce-4ca00b52cde866aff974dd8f5c840796598af605.tar.gz
Move FindLicense RPC to OPT OUT status
Acceptance testing was successful in https://gitlab.com/gitlab-org/gitaly/issues/1058. So this is moved to OPT OUT. Part of https://gitlab.com/gitlab-org/gitaly/issues/1026
-rw-r--r--changelogs/unreleased/zj-find-license-opt-out.yml5
-rw-r--r--lib/gitlab/git/repository.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/zj-find-license-opt-out.yml b/changelogs/unreleased/zj-find-license-opt-out.yml
new file mode 100644
index 00000000000..be2656601a9
--- /dev/null
+++ b/changelogs/unreleased/zj-find-license-opt-out.yml
@@ -0,0 +1,5 @@
+---
+title: Detect repository license on Gitaly by default
+merge_request:
+author:
+type: performance
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 8d97bfb0e6a..63989e6c42a 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1036,7 +1036,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