Merge branch 'zj-tag-containing-sha-opt-out' into 'master'

Tag with a commit detection defaults to Gitaly See merge request gitlab-org/gitlab-ce!18305

Merge branch 'zj-tag-containing-sha-opt-out' into 'master'
78fd1dd9 · Rémy Coutable · 13bf7094 · bbbe40ea · 78fd1dd9 · 78fd1dd9
Commit 78fd1dd9 authored Apr 11, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

zj-tag-containing-sha-opt-out.yml changelogs/unreleased/zj-tag-containing-sha-opt-out.yml +5 -0

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

No files found.
--- a/changelogs/unreleased/zj-tag-containing-sha-opt-out.yml
+++ b/changelogs/unreleased/zj-tag-containing-sha-opt-out.yml
+---
+title: Detecting tags containing a commit uses Gitaly by default
+merge_request:
+author:
+type: performance
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1395,7 +1395,8 @@ module Gitlab
      end

      def tag_names_contains_sha(sha)
-        gitaly_migrate(:tag_names_contains_sha) do |is_enabled|
+        gitaly_migrate(:tag_names_contains_sha,
+                       status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
          if is_enabled
            gitaly_ref_client.tag_names_contains_sha(sha)
          else