about summary refs log tree commit diff
path: root/app/views/settings/preferences/show.html.haml
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-02-10 22:08:45 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-02-10 22:08:45 -0600
commitb6159bcb0a20f3aabfb4d17ad60842b7aa81925c (patch)
tree5fbc5ebb3890ddbf0399bc1fd448f109561b2771 /app/views/settings/preferences/show.html.haml
parent136458eaf4f73abc5bcb5d0b0978aff892e92f27 (diff)
parentb8efc3fc0b961d356472cf2e56fde69a6589ffaa (diff)
Merge remote-tracking branch 'origin/merge-upstream'
Diffstat (limited to 'app/views/settings/preferences/show.html.haml')
-rw-r--r--app/views/settings/preferences/show.html.haml1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index a2a17d0d6..75dfa027e 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -36,6 +36,7 @@
 
   .fields-group
     = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label
+    = f.input :setting_display_sensitive_media, as: :boolean, wrapper: :with_label
     = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
     = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label