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/models/user.rb
+++ b/app/models/user.rb
@@ -207,6 +207,10 @@ class User < ApplicationRecord
    settings.notification_emails['pending_account']
  end

+  def allows_trending_tag_emails?
+    settings.notification_emails['trending_tag']
+  end
+
  def hides_network?
    @hides_network ||= settings.hide_network
  end