autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'v2.9.2' into instance_only_statuses

Browse Source
This commit is contained in:
Renato "Lond" Cerqueira
2019-06-25 19:44:59 +02:00
parent 1e5b17b88a 66ac1bd063
commit f0a512c7ca
534 changed files with 12629 additions and 7877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/user_settings_decorator.rb
View File

@ -34,6 +34,7 @@ class UserSettingsDecorator
user.settings['hide_network'] = hide_network_preference if change?('setting_hide_network')
user.settings['aggregate_reblogs'] = aggregate_reblogs_preference if change?('setting_aggregate_reblogs')
user.settings['show_application'] = show_application_preference if change?('setting_show_application')
user.settings['advanced_layout'] = advanced_layout_preference if change?('setting_advanced_layout')
end
def merged_notification_emails
@ -112,6 +113,10 @@ class UserSettingsDecorator
boolean_cast_setting 'setting_aggregate_reblogs'
end
def advanced_layout_preference
boolean_cast_setting 'setting_advanced_layout'
end
def boolean_cast_setting(key)
ActiveModel::Type::Boolean.new.cast(settings[key])
end