diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-08 22:40:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-08 22:40:21 +0100 |
| commit | 02133866e6915e37431298b396e1aded1e4c44c5 (patch) | |
| tree | 4ec43c5d1269ef7d5a3816a4d000bb7129bf81bd /app/controllers/settings | |
| parent | f03148f441d8dfc1856451c4faa00b5e26b6e199 (diff) | |
| parent | 481f7c8c3850a5d38e92222ab14e5229c49c2812 (diff) | |
Merge pull request #1713 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/settings/profiles_controller.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index dfe2ae2e5..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, 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 |