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

Conflicts: README.md Discarded upstream changes to the README, kept our version.
2018-09-03 14:33:06 +02:00
parent e915bc3e9e ccc2f608c5
commit 6c233a04a0
67 changed files with 1726 additions and 371 deletions
--- a/app/views/settings/notifications/show.html.haml
+++ b/app/views/settings/notifications/show.html.haml
@@ -12,6 +12,9 @@
      = ff.input :favourite, as: :boolean, wrapper: :with_label
      = ff.input :mention, as: :boolean, wrapper: :with_label

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