diff options
| author | Starfall <us@starfall.systems> | 2022-03-08 17:55:38 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-03-08 17:55:38 -0600 |
| commit | 239d67fc2c0ec82617de50a9831bc1a9efc30ecc (patch) | |
| tree | a6806025fe9e094994366434b08093cee5923557 /app/controllers/settings | |
| parent | ad1733ea294c6049336a9aeeb7ff96c8fea22cfa (diff) | |
| parent | 02133866e6915e37431298b396e1aded1e4c44c5 (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/controllers/settings')
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/settings/profiles_controller.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index d05ceb53f..1fddd087b 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -48,7 +48,6 @@ class Settings::PreferencesController < Settings::BaseController :setting_system_font_ui, :setting_system_emoji_font, :setting_noindex, - :setting_hide_network, :setting_hide_followers_count, :setting_aggregate_reblogs, :setting_show_application, @@ -58,7 +57,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_use_pending_items, :setting_trends, :setting_crop_images, - notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag), + notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag trending_link trending_status), interactions: %i(must_be_follower must_be_following must_be_following_dm) ) end diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb index 0c15447a6..be5b4f302 100644 --- a/app/controllers/settings/profiles_controller.rb +++ b/app/controllers/settings/profiles_controller.rb @@ -20,7 +20,7 @@ class Settings::ProfilesController < Settings::BaseController private def account_params - params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, fields_attributes: [:name, :value]) + params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, :hide_collections, fields_attributes: [:name, :value]) end def set_account |