diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-11 12:53:38 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-11 12:53:38 +0300 |
| commit | 2a7d011afd2a25eaa8ad07fac5b2a5113b06c458 (patch) | |
| tree | e1c27aac117f0d566fd8525d1b343550cf98bb1f | |
| parent | 78fd1dd99d924680cf7320c8e02240d3b314676d (diff) | |
| parent | 4d3f0998e0baae708a1b3af7cb6f059ef9257047 (diff) | |
Merge branch 'zj-branch-containing-sha-opt-out' into 'master'
Branch with a commit detection defaults to Gitaly
See merge request gitlab-org/gitlab-ce!18304
| -rw-r--r-- | changelogs/unreleased/zj-branch-containing-sha-opt-out.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/git/repository.rb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/zj-branch-containing-sha-opt-out.yml b/changelogs/unreleased/zj-branch-containing-sha-opt-out.yml new file mode 100644 index 00000000000..3d11ee588ae --- /dev/null +++ b/changelogs/unreleased/zj-branch-containing-sha-opt-out.yml @@ -0,0 +1,5 @@ +--- +title: Detecting branchnames containing a commit uses Gitaly by default +merge_request: +author: +type: performance diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 82a4aaef3fc..1a58db4e63e 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1385,7 +1385,8 @@ module Gitlab end def branch_names_contains_sha(sha) - gitaly_migrate(:branch_names_contains_sha) do |is_enabled| + gitaly_migrate(:branch_names_contains_sha, + status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| if is_enabled gitaly_ref_client.branch_names_contains_sha(sha) else |