diff options
| author | Dietrich Stein <dstein@gitlab.com> | 2019-07-17 13:10:23 -0400 |
|---|---|---|
| committer | Dietrich Stein <dstein@gitlab.com> | 2019-07-17 13:10:23 -0400 |
| commit | c6a2c8f673da4e4e32b15a5b563b25b474bcc263 (patch) | |
| tree | 739819c3f9b61b35e0097835ce67fab6dc50e218 /Gemfile.lock | |
| parent | 9bd4025b21f3ba65cde7755457111db799ef6744 (diff) | |
| parent | 2860cfaaff0a435792081b72a5f97de85e0d4f70 (diff) | |
| download | gitlab-ce-c6a2c8f673da4e4e32b15a5b563b25b474bcc263.tar.gz | |
Merge branch 'master' into ds-charts-whitespaceds-charts-whitespace
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
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) |