From d87c6b634e8d138a4fc6f94df1b517e63ea32db0 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 16 Jul 2019 10:07:07 -0700
Subject: [PATCH] Bump fog-aws to v3.5.2
This will make it possible for Oracle Cloud to work with S3 by disabling
Signature V4 streaming (https://github.com/fog/fog-aws/issues/523).
Full CHANGELOG:
https://github.com/fog/fog-aws/blob/master/CHANGELOG.md
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63041
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
changelogs/unreleased/sh-bump-fog-aws.yml | 5 +++++
3 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 changelogs/unreleased/sh-bump-fog-aws.yml
diff --git a/Gemfile b/Gemfile
index 7845e9d57faf7..8bffc2a973d91 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,7 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick'
# for backups
-gem 'fog-aws', '~> 3.3'
+gem 'fog-aws', '~> 3.5'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb.
gem 'fog-core', '= 2.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index beded888ffdb4..60939ae918c8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,7 +253,7 @@ GEM
fog-json
ipaddress (~> 0.8)
xml-simple (~> 1.1)
- fog-aws (3.3.0)
+ fog-aws (3.5.2)
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
@@ -1105,7 +1105,7 @@ DEPENDENCIES
flipper-active_support_cache_store (~> 0.13.0)
flowdock (~> 0.7)
fog-aliyun (~> 0.3)
- fog-aws (~> 3.3)
+ fog-aws (~> 3.5)
fog-core (= 2.1.0)
fog-google (~> 1.8)
fog-local (~> 0.6)
diff --git a/changelogs/unreleased/sh-bump-fog-aws.yml b/changelogs/unreleased/sh-bump-fog-aws.yml
new file mode 100644
index 0000000000000..a936b81ff0288
--- /dev/null
+++ b/changelogs/unreleased/sh-bump-fog-aws.yml
@@ -0,0 +1,5 @@
+---
+title: Bump fog-aws to v3.5.2
+merge_request: 30803
+author:
+type: fixed
--
GitLab