diff options
| author | ThibG <thib@sitedethib.com> | 2019-10-28 16:25:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-28 16:25:55 +0100 |
| commit | 00793a86bc52e4cb37318e42ea4ceb37a896c727 (patch) | |
| tree | 1c49c58aa3c45a4ccc5c513ed0539facaf6cc137 /app/controllers/settings/preferences_controller.rb | |
| parent | 18c07738a6b0fa3558863dbb1610695ab6f11b74 (diff) | |
| parent | 046cd05a839896ffa3aedb3270c7487f0766bdf9 (diff) | |
Merge pull request #1240 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 f05dbe0ea..75c3e2495 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -60,6 +60,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_use_blurhash, :setting_use_pending_items, :setting_trends, + :setting_crop_images, notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag), interactions: %i(must_be_follower must_be_following must_be_following_dm) ) |