diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-27 21:26:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-27 21:26:03 +0200 |
| commit | 1b0ce85e3da4b5c1941f65da7d73258da6eed6d0 (patch) | |
| tree | 4ee42aa7195fd98de901dd73947e4eda2f195015 /app/controllers/settings | |
| parent | fdb3952b203d562ba32ba3131d941fa4ea07d7b3 (diff) | |
| parent | 6d60701bfaa3a4b2bc168ea413c8f0c8e1545526 (diff) | |
Merge pull request #1072 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 3d98d583c..a713ee558 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -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) |