Merge branch 'master' into glitch-soc/merge-upstream

2019-08-06 13:16:53 +02:00
parent 3ea7a334d8 1d8d553d8b
commit cad2e6eb7a
39 changed files with 384 additions and 296 deletions
--- a/app/views/settings/preferences/notifications/show.html.haml
+++ b/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|