Merge branch 'master' into glitch-soc/merge-upstream
This commit is contained in:
commit
cad2e6eb7a
39 changed files with 384 additions and 296 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue