Merge tag 'v3.0.0' into hometown-dev

app/views/settings/preferences/appearance/show.html.haml

@@ -17,11 +17,19 @@
 
   %h4= t 'appearance.animations_and_accessibility'
 
+  .fields-group
+    = f.input :setting_use_pending_items, as: :boolean, wrapper: :with_label
+
   .fields-group
     = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label, recommended: true
     = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
     = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label
 
+  %h4= t 'appearance.discovery'
+
+  .fields-group
+    = f.input :setting_trends, as: :boolean, wrapper: :with_label
+
   %h4= t 'appearance.confirmation_dialogs'
 
   .fields-group
@@ -34,6 +42,9 @@
   .fields-group
     = 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
 

app/views/settings/preferences/notifications/show.html.haml

@@ -15,6 +15,7 @@
       - if current_user.staff?
         = ff.input :report, as: :boolean, wrapper: :with_label
         = ff.input :pending_account, as: :boolean, wrapper: :with_label
+        = ff.input :trending_tag, as: :boolean, wrapper: :with_label
 
   .fields-group
     = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|