diff --git a/Gemfile b/Gemfile index 52177e4..d7feb33 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ gem 'pundit' gem 'rolify' group :production do - gem 'aws-sdk' + gem 'aws-sdk', '< 2.0' gem 'rails_12factor' gem 'pg' gem 'puma' diff --git a/Gemfile.lock b/Gemfile.lock index e6f4c42..4bd5ba6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,12 +49,11 @@ GEM autoprefixer-rails (5.2.1) execjs json - aws-sdk (2.1.30) - aws-sdk-resources (= 2.1.30) - aws-sdk-core (2.1.30) - jmespath (~> 1.0) - aws-sdk-resources (2.1.30) - aws-sdk-core (= 2.1.30) + aws-sdk (1.66.0) + aws-sdk-v1 (= 1.66.0) + aws-sdk-v1 (1.66.0) + json (~> 1.4) + nokogiri (>= 1.4.4) better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -98,7 +97,6 @@ GEM jbuilder (2.3.1) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) - jmespath (1.1.3) jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) @@ -239,7 +237,7 @@ PLATFORMS DEPENDENCIES active_model_serializers - aws-sdk + aws-sdk (< 2.0) better_errors bootstrap-sass bullet