From 0bc94198fc64f7a0f9f7ee7d33dcae9aa50d1e3f Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 19 Aug 2015 12:51:42 -0700 Subject: Fix BaseMailer. --- app/mailers/base_mailer.rb | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'app/mailers/base_mailer.rb') diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb index 38b8a296842..8299a4140dc 100644 --- a/app/mailers/base_mailer.rb +++ b/app/mailers/base_mailer.rb @@ -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 -- cgit v1.2.3