diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-22 16:58:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-22 16:58:36 +0200 |
commit | 4f0bdbaaaf6828d7ee6fd6e6023375b727c0afe5 (patch) | |
tree | a36d3293a2f53c05935828cc6ebfb71713fb40ac | |
parent | f5b8bd4392d7955c84de187e56def191dcf7de51 (diff) |
Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 (#9049)
Fix #8889
-rw-r--r-- | Gemfile | 4 | ||||
-rw-r--r-- | Gemfile.lock | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile index c5e825335..6a0d33198 100644 --- a/Gemfile +++ b/Gemfile @@ -16,8 +16,8 @@ gem 'pghero', '~> 2.2' gem 'dotenv-rails', '~> 2.5' gem 'aws-sdk-s3', '~> 1.21', require: false -gem 'fog-core', '~> 2.1' -gem 'fog-openstack', '~> 1.0', require: false +gem 'fog-core', '<= 2.1.0' +gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' gem 'paperclip-av-transcoder', '~> 0.6' gem 'streamio-ffmpeg', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index fa36d4cbe..373ebbaf7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,7 +211,7 @@ GEM fast_blank (1.0.0) fastimage (2.1.4) ffi (1.9.25) - fog-core (2.1.2) + fog-core (2.1.0) builder excon (~> 0.58) formatador (~> 0.2) @@ -219,8 +219,8 @@ GEM fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-openstack (1.0.3) - fog-core (~> 2.1) + fog-openstack (0.3.7) + fog-core (>= 1.45, <= 2.1.0) fog-json (>= 1.0) ipaddress (>= 0.8) formatador (0.2.5) @@ -678,8 +678,8 @@ DEPENDENCIES faker (~> 1.9) fast_blank (~> 1.0) fastimage - fog-core (~> 2.1) - fog-openstack (~> 1.0) + fog-core (<= 2.1.0) + fog-openstack (~> 0.3) fuubar (~> 2.3) goldfinger (~> 2.1) hamlit-rails (~> 0.2) @@ -766,4 +766,4 @@ RUBY VERSION ruby 2.5.3p105 BUNDLED WITH - 1.16.5 + 1.16.6 |