diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-27 16:43:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 16:43:55 +0200 |
| commit | 2f95adc06fbfae22e8f9b4df212938108f5e295c (patch) | |
| tree | 13ff1b5ae743f3d147eb58dfa4a790ef1a7c049d /app/controllers/settings/preferences_controller.rb | |
| parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) | |
| parent | 6ab7051b48dcb1d45c377a129350db1fdeaf11b8 (diff) | |
Merge pull request #1142 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
| -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 5103cc50e..451742d41 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -52,6 +52,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_show_application, :setting_advanced_layout, :setting_default_content_type, + :setting_use_blurhash, notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account), interactions: %i(must_be_follower must_be_following must_be_following_dm) ) |