diff options
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile index 7a74aaf3f..7f46ffa66 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'dotenv-rails', '~> 2.2', '< 2.3' gem 'aws-sdk-s3', '~> 1.20', require: false gem 'fog-core', '~> 1.45' -gem 'fog-openstack', '~> 0.1', require: false +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 ffe4e43d9..df1a05d1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -219,11 +219,11 @@ GEM builder excon (~> 0.58) formatador (~> 0.2) - fog-json (1.0.2) - fog-core (~> 1.0) + fog-json (1.2.0) + fog-core multi_json (~> 1.10) - fog-openstack (0.1.25) - fog-core (~> 1.40) + fog-openstack (0.3.6) + fog-core (>= 1.45, <= 2.1.0) fog-json (>= 1.0) ipaddress (>= 0.8) formatador (0.2.5) @@ -685,7 +685,7 @@ DEPENDENCIES fast_blank (~> 1.0) fastimage fog-core (~> 1.45) - fog-openstack (~> 0.1) + fog-openstack (~> 0.3) fuubar (~> 2.2) goldfinger (~> 2.1) hamlit-rails (~> 0.2) |