diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-17 10:42:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-17 10:42:41 +0000 |
| commit | 787e205825289aadcdeabeb32498ad15e4f2a3d7 (patch) | |
| tree | acf8f344e9fc5c4d4bd5e4646769c0bee0843644 | |
| parent | 683fd52c59497b6c0c2ddb8933c47fca5651a614 (diff) | |
| parent | 7f8ef19c411eceec207fef5d8459fbeaa40bf464 (diff) | |
| download | gitlab-ce-787e205825289aadcdeabeb32498ad15e4f2a3d7.tar.gz | |
Merge branch '35155-upgrade-fog-core-to-1-44-3-and-its-providers-to-the-latest' into 'master'
Bump fog-core to 1.44.3 and fog providers' plugins to latest
Closes #35155
See merge request !12897
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 16 | ||||
| -rw-r--r-- | changelogs/unreleased/35155-upgrade-fog-core-to-1-44-3-and-its-providers-to-the-latest.yml | 4 |
3 files changed, 13 insertions, 9 deletions
@@ -91,7 +91,7 @@ gem 'carrierwave', '~> 1.1' gem 'dropzonejs-rails', '~> 0.7.1' # for backups -gem 'fog-aws', '~> 0.9' +gem 'fog-aws', '~> 1.4' gem 'fog-core', '~> 1.44' gem 'fog-google', '~> 0.5' gem 'fog-local', '~> 0.3' diff --git a/Gemfile.lock b/Gemfile.lock index 41ef1e9d456..e25a7d16461 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -186,7 +186,7 @@ GEM et-orbi (1.0.3) tzinfo eventmachine (1.0.8) - excon (0.55.0) + excon (0.57.1) execjs (2.6.0) expression_parser (0.9.0) extlib (0.9.16) @@ -222,26 +222,26 @@ GEM fog-json (~> 1.0) ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (0.13.0) + fog-aws (1.4.0) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.44.1) + fog-core (1.44.3) builder excon (~> 0.49) formatador (~> 0.2) - fog-google (0.5.0) + fog-google (0.5.3) fog-core fog-json fog-xml fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) - fog-local (0.3.0) + fog-local (0.3.1) fog-core (~> 1.27) - fog-openstack (0.1.6) - fog-core (>= 1.39) + fog-openstack (0.1.21) + fog-core (>= 1.40) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -961,7 +961,7 @@ DEPENDENCIES flipper (~> 0.10.2) flipper-active_record (~> 0.10.2) fog-aliyun (~> 0.1.0) - fog-aws (~> 0.9) + fog-aws (~> 1.4) fog-core (~> 1.44) fog-google (~> 0.5) fog-local (~> 0.3) diff --git a/changelogs/unreleased/35155-upgrade-fog-core-to-1-44-3-and-its-providers-to-the-latest.yml b/changelogs/unreleased/35155-upgrade-fog-core-to-1-44-3-and-its-providers-to-the-latest.yml new file mode 100644 index 00000000000..9d9558347ba --- /dev/null +++ b/changelogs/unreleased/35155-upgrade-fog-core-to-1-44-3-and-its-providers-to-the-latest.yml @@ -0,0 +1,4 @@ +--- +title: Bump fog-core to 1.44.3 and fog providers' plugins to latest +merge_request: 12897 +author: Takuya Noguchi |