Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-20 06:10:04 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-20 06:10:04 +0300
commitfefca4c7b96dddf0afcd34f33be8bf249448918b (patch)
treeaba2b19e32894ff00067e940bfaf20732da8aca3 /lib/object_storage
parentb5452c76b5b35884482214dbf6fe9971e0276d3b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/object_storage')
-rw-r--r--lib/object_storage/config.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/object_storage/config.rb b/lib/object_storage/config.rb
index 489b85104d6..2a91c726ec9 100644
--- a/lib/object_storage/config.rb
+++ b/lib/object_storage/config.rb
@@ -34,11 +34,11 @@ module ObjectStorage
end
def use_iam_profile?
- credentials.fetch(:use_iam_profile, false)
+ Gitlab::Utils.to_boolean(credentials[:use_iam_profile], default: false)
end
def use_path_style?
- credentials.fetch(:path_style, false)
+ Gitlab::Utils.to_boolean(credentials[:path_style], default: false)
end
def server_side_encryption