diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-23 09:52:11 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-23 09:52:11 +0000 |
| commit | d6d7abb1d047aa8677a7785f3a0e5ae9e605b061 (patch) | |
| tree | 85101b22e1daddd64e087a9709318fa4fd62ebc1 | |
| parent | 91f3930cc15a6696b443a8851d26e9a00b878f95 (diff) | |
| parent | 536b32c8fa16287a31efebc9e255f8de8697dbea (diff) | |
| download | gitlab-ce-d6d7abb1d047aa8677a7785f3a0e5ae9e605b061.tar.gz | |
Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master'
Make Repo#squash_in_progress Opt-Out
See merge request gitlab-org/gitlab-ce!19088
| -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 1e6beeef9f7..1a21625a322 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 |