tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thibaut Girka committed 2018-08-26 18:21:33 +02:00
2 parents 5eb3b8522e a791bac153
commit be20eb4b2f
67 files changed
+798 -178
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/services/notify_service.rb
+1 -1
View File
@@ -123,7 +123,7 @@ class NotifyService < BaseService
def send_email
return if @notification.activity.nil?
NotificationMailer.public_send(@notification.type, @recipient, @notification).deliver_later
NotificationMailer.public_send(@notification.type, @recipient, @notification).deliver_later(wait: 2.minutes)
end
def email_enabled?