Fix BaseMailer.

This commit is contained in:
Douwe Maan 2015-08-19 12:51:42 -07:00
parent 4e33127b3a
commit 0bc94198fc
1 changed files with 1 additions and 19 deletions

View File

@ -1,4 +1,4 @@
class EmailRejectionMailer < ActionMailer::Base
class BaseMailer < ActionMailer::Base
add_template_helper ApplicationHelper
add_template_helper GitlabMarkdownHelper
@ -12,24 +12,6 @@ class EmailRejectionMailer < ActionMailer::Base
delay_for(2.seconds)
end
def rejection(reason, original_raw, can_retry = false)
@reason = reason
@original_message = Mail::Message.new(original_raw)
headers = {
to: @original_message.from,
subject: "[Rejected] #{@original_message.subject}"
}
headers['Message-ID'] = SecureRandom.hex
headers['In-Reply-To'] = @original_message.message_id
headers['References'] = @original_message.message_id
headers['Reply-To'] = @original_message.to.first if can_retry
mail(headers)
end
def can?
Ability.abilities.allowed?(user, action, subject)
end