diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
| commit | d69fa9e1f40124279ec9d772e5f54d1e11724e2d (patch) | |
| tree | ef0462e5fcc8cc7962ef42d80f7dd520a574a7c5 /app/controllers/settings | |
| parent | c727eae4412ac9e4f1bafdc68fe89dcd46d602ca (diff) | |
| parent | 0b4006fc47dcd3d57ffdd0b95c95ad4c40a4918f (diff) | |
Merge changes from upstream with the CSS reload fix
Diffstat (limited to 'app/controllers/settings')
| -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 a3f5a008b..f107f2b16 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -35,6 +35,7 @@ class Settings::PreferencesController < ApplicationController params.require(:user).permit( :setting_default_privacy, :setting_default_sensitive, + :setting_unfollow_modal, :setting_boost_modal, :setting_delete_modal, :setting_auto_play_gif, |