Commit d6d7abb1 authored by Douwe Maan's avatar Douwe Maan

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
parents 91f3930c 536b32c8
...@@ -1334,7 +1334,7 @@ module Gitlab ...@@ -1334,7 +1334,7 @@ module Gitlab
end end
def squash_in_progress?(squash_id) 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 if is_enabled
gitaly_repository_client.squash_in_progress?(squash_id) gitaly_repository_client.squash_in_progress?(squash_id)
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment