diff --git a/Gemfile b/Gemfile index 92620d991c3..fe7bff5653a 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'pghero', '~> 2.8' gem 'dotenv-rails', '~> 2.8' gem 'aws-sdk-s3', '~> 1.117', require: false -gem 'fog-core', '<= 2.1.0' +gem 'fog-core', '<= 2.4.0' gem 'fog-openstack', '~> 0.3', require: false gem 'kt-paperclip', '~> 7.1' gem 'blurhash', '~> 0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 25ffebdbe14..f23143639dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -226,7 +226,7 @@ GEM erubi (1.11.0) et-orbi (1.2.7) tzinfo - excon (0.76.0) + excon (0.95.0) fabrication (2.30.0) faker (3.0.0) i18n (>= 1.8.11, < 2) @@ -259,19 +259,19 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - fog-core (2.1.0) + fog-core (2.3.0) builder - excon (~> 0.58) - formatador (~> 0.2) + excon (~> 0.71) + formatador (>= 0.2, < 2.0) mime-types fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-openstack (0.3.10) - fog-core (>= 1.45, <= 2.1.0) + fog-openstack (0.3.2) + fog-core (~> 2.1) fog-json (>= 1.0) ipaddress (>= 0.8) - formatador (0.2.5) + formatador (1.1.0) fugit (1.7.1) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) @@ -785,7 +785,7 @@ DEPENDENCIES faker (~> 3.0) fast_blank (~> 1.0) fastimage - fog-core (<= 2.1.0) + fog-core (<= 2.4.0) fog-openstack (~> 0.3) fuubar (~> 2.5) gitlab-omniauth-openid-connect (~> 0.10.0)