diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-02 12:01:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 12:01:40 +0200 |
| commit | 35e9d099b3febd75d1613dfc8a494e769a98c3a6 (patch) | |
| tree | 2aceaee757bd292e3d05811673a7bfe419e7b064 /app/controllers/settings/preferences_controller.rb | |
| parent | 4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (diff) | |
| parent | 6ad76069096005d7b55d9c63a567f843997a8068 (diff) | |
Merge pull request #758 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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index d60e6a89f..5c5f31d2b 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -37,7 +37,8 @@ class Settings::PreferencesController < Settings::BaseController :setting_favourite_modal, :setting_delete_modal, :setting_auto_play_gif, - :setting_display_sensitive_media, + :setting_display_media, + :setting_expand_spoilers, :setting_reduce_motion, :setting_system_font_ui, :setting_noindex, |