about summary refs log tree commit diff
path: root/app/views/settings
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-12-09 13:03:01 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-12-09 13:03:01 +0100
commit81bda7d67c984c9bfcb5bca94e50cec6405b492e (patch)
treed9742d61a1f80bd494f8a40305658daef7d3b410 /app/views/settings
parent6b78e5b5ab813625152149b7e215d0568a595cdc (diff)
Add setting to not aggregate reblogs (#9248)
* Add setting to not aggregate reblogs

Fixes #9222

* Handle cases where user is nil in add_to_home and add_to_list

* Add hint for setting_aggregate_reblogs option

* Reword setting_aggregate_reblogs label
Diffstat (limited to 'app/views/settings')
-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 ecb789f93..a2c61c9a6 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -48,6 +48,9 @@
     = f.input :setting_delete_modal, as: :boolean, wrapper: :with_label
 
   .fields-group
+    = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label
+
+  .fields-group
     = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label
     = f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label
     = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label