diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-04 17:41:54 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-04 17:41:54 +0000 |
| commit | d5d7bcf8b7404a436c577e2b112aa59dc2901378 (patch) | |
| tree | 35a308231531d39503775d26d58cddd4e323c2bc | |
| parent | 1be9f587351639a359416e915a25faf7280b65e9 (diff) | |
| parent | 39cc4a92028445c0912f95880c0a9a8cedb3e227 (diff) | |
| download | gitlab-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
| -rw-r--r-- | changelogs/unreleased/zj-opt-out-delete-refs.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/git/repository.rb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/zj-opt-out-delete-refs.yml b/changelogs/unreleased/zj-opt-out-delete-refs.yml new file mode 100644 index 00000000000..b02a45eee17 --- /dev/null +++ b/changelogs/unreleased/zj-opt-out-delete-refs.yml @@ -0,0 +1,5 @@ +--- +title: Bulk deleting refs is handled by Gitaly by default +merge_request: +author: +type: performance 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 |