diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-07-17 06:54:00 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-07-17 06:54:00 +0000 |
| commit | 1574d2839fa9a4258e28af92ed0c5c07df424161 (patch) | |
| tree | 6b243f4cc33158ebefbd7d4f72270304c21f5d2d | |
| parent | c1202131f47f8bcd5b3bc36119b99a3d5256343b (diff) | |
| parent | d87c6b634e8d138a4fc6f94df1b517e63ea32db0 (diff) | |
| download | gitlab-ce-1574d2839fa9a4258e28af92ed0c5c07df424161.tar.gz | |
Merge branch 'sh-bump-fog-aws' into 'master'
Bump fog-aws to v3.5.2
Closes #63041
See merge request gitlab-org/gitlab-ce!30803
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-bump-fog-aws.yml | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -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 beded888ffd..60939ae918c 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 00000000000..a936b81ff02 --- /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 |