diff options
author | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
commit | 82b2e224a26765caf743b24844912faa2de9873a (patch) | |
tree | 1ee49dd3dbcef7867ad93f875262951612815851 /Gemfile | |
parent | 6abb0950c6f694607cdc6a0c564751400d52ad5a (diff) | |
parent | e0a573a2cef924fdfec2cd7ec96a712fe2de1511 (diff) |
Merge branch 'gs-master' into prevent-local-only-federation
Conflicts: db/schema.rb
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index e43b1a256..5e91d1425 100644 --- a/Gemfile +++ b/Gemfile @@ -14,12 +14,13 @@ gem 'pg', '~> 0.20' gem 'pghero', '~> 1.7' gem 'dotenv-rails', '~> 2.2' -gem 'fog-aws', '~> 1.4', require: false +gem 'aws-sdk', '~> 2.10', require: false gem 'fog-core', '~> 1.45' gem 'fog-local', '~> 0.4', require: false gem 'fog-openstack', '~> 0.1', require: false gem 'paperclip', '~> 5.1' gem 'paperclip-av-transcoder', '~> 0.6' +gem 'posix-spawn' gem 'active_model_serializers', '~> 0.10' gem 'addressable', '~> 2.5' |