summaryrefslogtreecommitdiff
path: root/lib/backup/manager.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-13 00:10:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-13 00:10:42 +0000
commitd587f345b4fe9483c69ba55cbe7647504b90c78b (patch)
tree6f795cea2c537b47562d2ddd2ab792c830542b89 /lib/backup/manager.rb
parent0e521d428084e9f0a3028a02639fb448eaf1b0b4 (diff)
downloadgitlab-ce-d587f345b4fe9483c69ba55cbe7647504b90c78b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/backup/manager.rb')
-rw-r--r--lib/backup/manager.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 71cb4d818a7..fffaffda71c 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -271,7 +271,7 @@ module Backup
def upload
connection_settings = Gitlab.config.backup.upload.connection
- if connection_settings.blank?
+ if connection_settings.blank? || skipped?('remote')
puts_time "Uploading backup archive to remote storage #{remote_directory} ... ".color(:blue) + "[SKIPPED]".color(:cyan)
return
end