Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
This commit is contained in:
Thibaut Girka 2019-05-26 15:41:40 +02:00
commit 20d01a954e
40 changed files with 623 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/settings/preferences_controller.rb
View file

@ -46,6 +46,7 @@ class Settings::PreferencesController < Settings::BaseController
:setting_hide_followers_count,
:setting_aggregate_reblogs,
:setting_show_application,
:setting_advanced_layout,
:setting_default_content_type,
notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account),
interactions: %i(must_be_follower must_be_following)