about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-05-26 15:41:40 +0200
committerThibaut Girka <thib@sitedethib.com>2019-05-26 15:41:40 +0200
commit20d01a954e0961eed41954bd23713e91a1dafe14 (patch)
treea7a8ba480fabe4f669755ef4c0b78e213b1ea2ac /app/views
parentfdb3952b203d562ba32ba3131d941fa4ea07d7b3 (diff)
parent63483ee543eb6c81e2cf6450a682cdb657e92751 (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

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/settings/preferences/show.html.haml3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index cd5bf9be2..45c8b55db 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -47,6 +47,9 @@
   %hr#settings_web/
 
   .fields-group
+    = f.input :setting_advanced_layout, as: :boolean, wrapper: :with_label
+
+  .fields-group
     = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label
     = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
     = f.input :setting_favourite_modal, as: :boolean, wrapper: :with_label