summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-03-06 16:21:50 +0100
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-03-07 14:52:57 +0100
commit0136bbbb89eb975ed5ae053d903ed5d3eb7d811f (patch)
tree0164fea21df7f8babc114356ff98990365774f16 /lib
parent790d5147e34a6f9a8b0d954b9651052ceff4558a (diff)
downloadgitlab-ce-0136bbbb89eb975ed5ae053d903ed5d3eb7d811f.tar.gz
Move OperationService#UserRemoveBranch
Part of: gitlab-org/gitaly#476
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/repository.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 29f2927adfe..1445b7924dc 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -735,7 +735,7 @@ module Gitlab
end
def rm_branch(branch_name, user:)
- gitaly_migrate(:operation_user_delete_branch) do |is_enabled|
+ gitaly_migrate(:operation_user_delete_branch, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled
gitaly_operations_client.user_delete_branch(branch_name, user)
else