diff options
| author | ThibG <thib@sitedethib.com> | 2018-09-03 17:40:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 17:40:03 +0200 |
| commit | 174548f3bd0f1d42a28a5c501aad7116f18eaddb (patch) | |
| tree | 24b32d52e098fac57e91fd26be1311b7b677c9c9 /app/controllers/settings/preferences_controller.rb | |
| parent | e915bc3e9e32e34bf80d1bd66ee3f80d2ca37969 (diff) | |
| parent | 6c233a04a04f674b1be75ce7c6c4547c7a006797 (diff) | |
Merge pull request #702 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 4733170dc..d60e6a89f 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -42,7 +42,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_system_font_ui, :setting_noindex, :setting_hide_network, - notification_emails: %i(follow follow_request reblog favourite mention digest), + notification_emails: %i(follow follow_request reblog favourite mention digest report), interactions: %i(must_be_follower must_be_following) ) end |