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 
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb

Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
This commit is contained in:
Thibaut Girka
2019-03-23 22:10:51 +01:00
parent 9f56511860 9ec98893f4
commit fcce135d27
15 changed files with 231 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -15,7 +15,7 @@ gem 'makara', '~> 0.4'
gem 'pghero', '~> 2.2'
gem 'dotenv-rails', '~> 2.7'
gem 'aws-sdk-s3', '~> 1.33', require: false
gem 'aws-sdk-s3', '~> 1.34', require: false
gem 'fog-core', '<= 2.1.0'
gem 'fog-openstack', '~> 0.3', require: false
gem 'paperclip', '~> 6.0'