summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-05-04 20:20:07 +0900
committerShinya Maeda <shinya@gitlab.com>2018-05-04 20:20:07 +0900
commit8fd76a752b2a67d1b0c15615be7a8b740e1ce082 (patch)
treeae093f6a303bd7e70ac791c699f4a529ce3f51f2 /lib/gitlab
parent07375df12ee5820c8405ee2d23ea6980150e0d82 (diff)
parent8b47980e12887e255146ce155b446d9176586cfe (diff)
downloadgitlab-ce-8fd76a752b2a67d1b0c15615be7a8b740e1ce082.tar.gz
Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/git/gitlab_projects.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/git/gitlab_projects.rb b/lib/gitlab/git/gitlab_projects.rb
index 099709620b3..68373460d23 100644
--- a/lib/gitlab/git/gitlab_projects.rb
+++ b/lib/gitlab/git/gitlab_projects.rb
@@ -63,7 +63,8 @@ module Gitlab
end
def fork_repository(new_shard_name, new_repository_relative_path)
- Gitlab::GitalyClient.migrate(:fork_repository) do |is_enabled|
+ Gitlab::GitalyClient.migrate(:fork_repository,
+ status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled
gitaly_fork_repository(new_shard_name, new_repository_relative_path)
else