summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-04-04 17:41:54 +0000
committerRémy Coutable <remy@rymai.me>2018-04-04 17:41:54 +0000
commitd5d7bcf8b7404a436c577e2b112aa59dc2901378 (patch)
tree35a308231531d39503775d26d58cddd4e323c2bc /lib
parent1be9f587351639a359416e915a25faf7280b65e9 (diff)
parent39cc4a92028445c0912f95880c0a9a8cedb3e227 (diff)
downloadgitlab-ce-d5d7bcf8b7404a436c577e2b112aa59dc2901378.tar.gz
Merge branch 'zj-opt-out-delete-refs' into 'master'
Bulk deleting refs is handled by Gitaly by default See merge request gitlab-org/gitlab-ce!18180
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/repository.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index d16a096ffb9..8d97bfb0e6a 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -885,7 +885,8 @@ module Gitlab
end
def delete_refs(*ref_names)
- gitaly_migrate(:delete_refs) do |is_enabled|
+ gitaly_migrate(:delete_refs,
+ status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
if is_enabled
gitaly_delete_refs(*ref_names)
else