diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-14 17:12:47 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-14 17:12:47 +0000 |
| commit | 4063f35f00bea4b2fc26640db385abb4e72043bd (patch) | |
| tree | 6f8020fe89c537d1fc4b45a09eb3b4e3d4d7b138 | |
| parent | 9be9328bc2a9e9da71d77a1fbcf76336e89e53f1 (diff) | |
| parent | 867890658b1018eb5777bd0af8a7be7b673a865c (diff) | |
| download | gitlab-ce-4063f35f00bea4b2fc26640db385abb4e72043bd.tar.gz | |
Merge branch 'update-fog-aws' into 'master'
update fog-aws 1.4 -> 2.0
See merge request gitlab-org/gitlab-ce!17708
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -104,7 +104,7 @@ gem 'carrierwave', '~> 1.2' gem 'dropzonejs-rails', '~> 0.7.1' # for backups -gem 'fog-aws', '~> 1.4' +gem 'fog-aws', '~> 2.0' gem 'fog-core', '~> 1.44' gem 'fog-google', '~> 0.5' gem 'fog-local', '~> 0.3' diff --git a/Gemfile.lock b/Gemfile.lock index e25d407cbce..e853f5c618c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -194,7 +194,7 @@ GEM et-orbi (1.0.3) tzinfo eventmachine (1.0.8) - excon (0.57.1) + excon (0.60.0) execjs (2.6.0) expression_parser (0.9.0) factory_bot (4.8.2) @@ -233,14 +233,14 @@ GEM fog-json (~> 1.0) ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (1.4.0) + fog-aws (2.0.1) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.44.3) + fog-core (1.45.0) builder - excon (~> 0.49) + excon (~> 0.58) formatador (~> 0.2) fog-google (0.5.3) fog-core @@ -1047,7 +1047,7 @@ DEPENDENCIES flipper-active_record (~> 0.11.0) flipper-active_support_cache_store (~> 0.11.0) fog-aliyun (~> 0.2.0) - fog-aws (~> 1.4) + fog-aws (~> 2.0) fog-core (~> 1.44) fog-google (~> 0.5) fog-local (~> 0.3) |