tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2018-10-08 13:51:33 +02:00
parent 96c3d26870 4c4ff05a46
commit d17844e6d1
58 changed files with 875 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -15,7 +15,7 @@ gem 'makara', '~> 0.4'
gem 'pghero', '~> 2.2'
gem 'dotenv-rails', '~> 2.2', '< 2.3'
gem 'aws-sdk-s3', '~> 1.20', require: false
gem 'aws-sdk-s3', '~> 1.21', require: false
gem 'fog-core', '~> 2.1'
gem 'fog-openstack', '~> 1.0', require: false
gem 'paperclip', '~> 6.0'
@ -107,7 +107,7 @@ group :production, :test do
end
group :test do
gem 'capybara', '~> 3.8'
gem 'capybara', '~> 3.9'
gem 'climate_control', '~> 0.2'
gem 'faker', '~> 1.8'
gem 'microformats', '~> 4.0'