about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-06-26 22:54:09 +0200
committerThibaut Girka <thib@sitedethib.com>2019-06-26 23:19:22 +0200
commitaaec64a500346502aedefff446f1d8688ac5077c (patch)
treeb24b5c7fa4b500b00c85cee3ef2cbb553d763f4d /app/views
parent9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff)
parent3086c645fde2345d34e401bdf3e2f19f19da3294 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
Diffstat (limited to 'app/views')
-rw-r--r--app/views/settings/preferences/appearance/show.html.haml3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 9577c10b5..1709c9c84 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -33,6 +33,9 @@
     = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'],label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', wrapper: :with_floating_label
 
   .fields-group
+    = f.input :setting_use_blurhash, as: :boolean, wrapper: :with_label
+
+  .fields-group
     = f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label
 
   .actions