Merge branch 'zj-find-license-opt-out' into 'master'

Move FindLicense RPC to OPT OUT status See merge request gitlab-org/gitlab-ce!18228

Merge branch 'zj-find-license-opt-out' into 'master'
a2a6a5ca · Grzegorz Bizon · fb0bb32f · 4ca00b52 · a2a6a5ca · a2a6a5ca
Commit a2a6a5ca authored Apr 09, 2018 by Grzegorz Bizon
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

zj-find-license-opt-out.yml changelogs/unreleased/zj-find-license-opt-out.yml +5 -0

repository.rb lib/gitlab/git/repository.rb +2 -1

No files found.
--- a/changelogs/unreleased/zj-find-license-opt-out.yml
+++ b/changelogs/unreleased/zj-find-license-opt-out.yml
+---
+title: Detect repository license on Gitaly by default
+merge_request:
+author:
+type: performance
--- 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