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

Merge tag 'v2.8.0' into instance_only_statuses

Browse Source
This commit is contained in:
Renato "Lond" Cerqueira
2019-04-13 23:47:24 +02:00
parent 153385e508 6afab2587d
commit 546581d2ba
689 changed files with 25483 additions and 9047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/user_settings_decorator.rb
View File

@ -33,6 +33,7 @@ class UserSettingsDecorator
user.settings['theme'] = theme_preference if change?('setting_theme')
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')
end
def merged_notification_emails
@ -95,6 +96,10 @@ class UserSettingsDecorator
boolean_cast_setting 'setting_hide_network'
end
def show_application_preference
boolean_cast_setting 'setting_show_application'
end
def theme_preference
settings['setting_theme']
end