about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-02-09 09:25:53 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-02-09 09:25:53 -0600
commit020b40efdb2e4ddac14bea81ad60512d51eb7fe5 (patch)
treeb9afe17c1257490af354f76d6e1c1f1b3788e546 /app/controllers
parent5ba2c300d8ab0e3adc58a380162b66abafbb3bb8 (diff)
parent235c14c79d620d47012a08425324df222a136457 (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
 Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/settings/preferences_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 7cd1abe0c..c853b5ab7 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -36,6 +36,7 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_favourite_modal,
       :setting_delete_modal,
       :setting_auto_play_gif,
+      :setting_display_sensitive_media,
       :setting_reduce_motion,
       :setting_system_font_ui,
       :setting_noindex,