diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-11-21 18:52:09 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-11-21 18:52:09 +0000 |
| commit | a96a0d707e1077f45f56b7adeb9b69eb01230a56 (patch) | |
| tree | aa93eb4151c70841f5ccfde4b9b0b8af795c5ac3 | |
| parent | 6061b8de6640449f7f534d849c0506165d79d004 (diff) | |
| parent | 99092a744c73961ac754e22d929b2730ec8210c3 (diff) | |
| download | gitlab-ce-a96a0d707e1077f45f56b7adeb9b69eb01230a56.tar.gz | |
Merge branch 'opt-in-gitaly' into '10-2-stable'
Opt in gitaly
See merge request gitlab-org/gitlab-ce!15522
| -rw-r--r-- | lib/gitlab/git/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 9379172bc54..8128d91480d 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -167,7 +167,7 @@ module Gitlab end def local_branches(sort_by: nil) - gitaly_migrate(:local_branches, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| + gitaly_migrate(:local_branches) do |is_enabled| if is_enabled gitaly_ref_client.local_branches(sort_by: sort_by) else |