diff options
author | Kim Carlbäcker <kim.carlbacker@gmail.com> | 2018-05-22 15:44:42 +0000 |
---|---|---|
committer | Kim Carlbäcker <kim.carlbacker@gmail.com> | 2018-05-22 15:44:42 +0000 |
commit | 536b32c8fa16287a31efebc9e255f8de8697dbea (patch) | |
tree | 219c5568a7ddf69a777f6b18c28024f3a2c41e0a /lib/gitlab/git | |
parent | b884cfc6c212e8d9fbe709e8859de4526d436836 (diff) | |
download | gitlab-ce-536b32c8fa16287a31efebc9e255f8de8697dbea.tar.gz |
Make Repo#squash_in_progress Opt-Outgitaly-repo-squash-in-progress-opt-out
Diffstat (limited to 'lib/gitlab/git')
-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 2be604a5b13..224cd50c02e 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1334,7 +1334,7 @@ module Gitlab end def squash_in_progress?(squash_id) - gitaly_migrate(:squash_in_progress) do |is_enabled| + gitaly_migrate(:squash_in_progress, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| if is_enabled gitaly_repository_client.squash_in_progress?(squash_id) else |