summaryrefslogtreecommitdiff
path: root/lib/backup
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-02 06:08:59 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-02 06:08:59 +0000
commit5ab92edc77d032261ce105e3fa13355b92f8ed32 (patch)
treed2628c82859c7c8810481ec54c7d564f2e080b78 /lib/backup
parent0409a31740fa29fa1131c0496da16677cb3debe4 (diff)
downloadgitlab-ce-5ab92edc77d032261ce105e3fa13355b92f8ed32.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/backup')
-rw-r--r--lib/backup/manager.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index a8b3c12a2a2..10364e39106 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -523,9 +523,7 @@ module Backup
end
def object_storage_config
- @object_storage_config ||= begin
- ObjectStorage::Config.new(Gitlab.config.backup.upload)
- end
+ @object_storage_config ||= ObjectStorage::Config.new(Gitlab.config.backup.upload)
end
def connect_to_remote_directory