mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-21 20:15:10 +01:00
Code Issues Projects Releases Wiki Activity

Downgrade aws gem as this one was incompatible with Paperclip

Browse Source
This commit is contained in:
Eugen Rochko 2016-11-06 20:55:57 +01:00
parent d14967e1c8
commit ea4170785a
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -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'

14
Gemfile.lock
View File

@ -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