diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-15 18:26:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-15 18:26:55 +0000 |
| commit | ffabab80a7b0cebe322aaf9bb2ca8e617a0b790f (patch) | |
| tree | d996518deed6c58b658d3294a700a56301b07297 | |
| parent | aab904f7437c13bc9b9496ac800eccd57d612ccf (diff) | |
| parent | 6d46e51031e3d27044f692eba2fe332f26f59478 (diff) | |
| download | gitlab-ce-ffabab80a7b0cebe322aaf9bb2ca8e617a0b790f.tar.gz | |
Merge branch 'use-gitaly-migrate' into 'master'
Use gitaly_migrate helper on all current migrations in repository
See merge request !11309
| -rw-r--r-- | lib/gitlab/git/repository.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 7a051444603..d380c5021ee 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -116,7 +116,7 @@ module Gitlab # Returns the number of valid branches def branch_count - Gitlab::GitalyClient.migrate(:branch_names) do |is_enabled| + gitaly_migrate(:branch_names) do |is_enabled| if is_enabled gitaly_ref_client.count_branch_names else @@ -135,7 +135,7 @@ module Gitlab # Returns the number of valid tags def tag_count - Gitlab::GitalyClient.migrate(:tag_names) do |is_enabled| + gitaly_migrate(:tag_names) do |is_enabled| if is_enabled gitaly_ref_client.count_tag_names else @@ -473,7 +473,7 @@ module Gitlab def ref_name_for_sha(ref_path, sha) # NOTE: This feature is intentionally disabled until # https://gitlab.com/gitlab-org/gitaly/issues/180 is resolved - # Gitlab::GitalyClient.migrate(:find_ref_name) do |is_enabled| + # gitaly_migrate(:find_ref_name) do |is_enabled| # if is_enabled # gitaly_ref_client.find_ref_name(sha, ref_path) # else |