diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-06 20:55:57 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-06 20:55:57 +0100 |
| commit | ea4170785a8f0f05cea93b1b64c00aa1008ef292 (patch) | |
| tree | f52582047b729e012272805b40fe3affd53595a8 | |
| parent | d14967e1c825eae1288c7a5bb1a30f49f174f857 (diff) | |
Downgrade aws gem as this one was incompatible with Paperclip
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/Gemfile b/Gemfile index fc5dce72b..2c8b2c871 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ gem 'font-awesome-rails' gem 'paperclip', '~> 4.3' gem 'paperclip-av-transcoder' -gem 'aws-sdk', '~> 2.3' +gem 'aws-sdk', '< 2.0' gem 'http' gem 'httplog' diff --git a/Gemfile.lock b/Gemfile.lock index f3ec10c0a..2ffdfa07b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,12 +44,11 @@ GEM ast (2.3.0) av (0.9.0) cocaine (~> 0.5.3) - aws-sdk (2.6.18) - aws-sdk-resources (= 2.6.18) - aws-sdk-core (2.6.18) - jmespath (~> 1.0) - aws-sdk-resources (2.6.18) - aws-sdk-core (= 2.6.18) + aws-sdk (1.66.0) + aws-sdk-v1 (= 1.66.0) + aws-sdk-v1 (1.66.0) + json (~> 1.4) + nokogiri (>= 1.4.4) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) @@ -145,7 +144,6 @@ GEM jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) - jmespath (1.3.1) jquery-rails (4.1.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -381,7 +379,7 @@ PLATFORMS DEPENDENCIES active_record_query_trace addressable - aws-sdk (~> 2.3) + aws-sdk (< 2.0) better_errors binding_of_caller browserify-rails |