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

2018-08-26 18:21:33 +02:00
parent 5eb3b8522e a791bac153
commit be20eb4b2f
67 changed files with 798 additions and 178 deletions
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@ -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?