diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-26 14:00:43 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-26 14:00:43 +0000 |
| commit | 5f29b4b67ba63b132b9cc550a2bd633546bd5d65 (patch) | |
| tree | 87427289ce884372e6c237dd4f7e500aaa217cdd | |
| parent | b33a4da342c765218ee4fb4e6d274382b2a77f08 (diff) | |
| parent | 7d14b725a0da41d1ae7c0a8496b5e66832023e3b (diff) | |
| download | gitlab-ce-5f29b4b67ba63b132b9cc550a2bd633546bd5d65.tar.gz | |
Merge branch 'gitaly-backup-opt-out' into 'master'
Move repo backup RPC's to opt-out
See merge request gitlab-org/gitlab-ce!20151
| -rw-r--r-- | lib/backup/repository.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb index 50a5e340191..af762db517c 100644 --- a/lib/backup/repository.rb +++ b/lib/backup/repository.rb @@ -48,7 +48,7 @@ module Backup end def backup_project(project) - gitaly_migrate(:repository_backup) do |is_enabled| + gitaly_migrate(:repository_backup, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| if is_enabled backup_project_gitaly(project) else @@ -80,7 +80,7 @@ module Backup end def delete_all_repositories(name, repository_storage) - gitaly_migrate(:delete_all_repositories) do |is_enabled| + gitaly_migrate(:delete_all_repositories, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| if is_enabled Gitlab::GitalyClient::StorageService.new(name).delete_all_repositories else @@ -148,7 +148,7 @@ module Backup end def backup_custom_hooks(project) - gitaly_migrate(:backup_custom_hooks) do |is_enabled| + gitaly_migrate(:backup_custom_hooks, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| if is_enabled gitaly_backup_custom_hooks(project) else @@ -159,7 +159,7 @@ module Backup def restore_custom_hooks(project) in_path(path_to_tars(project)) do |dir| - gitaly_migrate(:restore_custom_hooks) do |is_enabled| + gitaly_migrate(:restore_custom_hooks, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| if is_enabled gitaly_restore_custom_hooks(project, dir) else |