about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-10-21 01:50:04 -0500
committerFire Demon <firedemon@creature.cafe>2020-10-21 01:50:04 -0500
commit0a32c484e1b8819983514f6f06da30c910cdd133 (patch)
tree48457fb5e94b1b47aeeb0c1d92758e58889b9fe9 /app/views
parent0e6cb59f2f51ad6831188b47fd9e5c6827e9ff91 (diff)
Make receiving boosts from Tavern timeline in home feed opt-in; always aggregate boosts
Diffstat (limited to 'app/views')
-rw-r--r--app/views/settings/preferences/appearance/show.html.haml3
-rw-r--r--app/views/settings/preferences/filters/show.html.haml2
2 files changed, 1 insertions, 4 deletions
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 87e7b91c5..48031a973 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -17,9 +17,6 @@
   %p.hint= t 'appearance.advanced_web_interface_hint'
 
   .fields-group
-    = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label, recommended: true
-
-  .fields-group
     = f.input :setting_advanced_layout, as: :boolean, wrapper: :with_label, hint: false
 
   %h4= t 'appearance.animations_and_accessibility'
diff --git a/app/views/settings/preferences/filters/show.html.haml b/app/views/settings/preferences/filters/show.html.haml
index c30167cb5..17fa4c4a6 100644
--- a/app/views/settings/preferences/filters/show.html.haml
+++ b/app/views/settings/preferences/filters/show.html.haml
@@ -10,7 +10,7 @@
   %h4= t 'preferences.filtering'
 
   .fields-group
-    = f.input :setting_no_boosts_home, as: :boolean, wrapper: :with_label
+    = f.input :setting_home_reblogs, as: :boolean, wrapper: :with_label
 
   .fields-group
     = f.input :setting_filter_unknown, as: :boolean, wrapper: :with_label