diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-08-19 12:35:08 -0700 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-08-19 12:35:08 -0700 |
commit | a8a861ae2a122b310d1aca6f9f9b1d0601b8c49f (patch) | |
tree | 0ac781a4036e8ca65d5f697c7a30f910db7ddd25 /app/mailers/email_rejection_mailer.rb | |
parent | 03b54f1f0324c4d424d66e4bf36e42c2a88fc26d (diff) | |
download | gitlab-ce-a8a861ae2a122b310d1aca6f9f9b1d0601b8c49f.tar.gz |
Add BaseMailer to house shared mailer functionality.
Diffstat (limited to 'app/mailers/email_rejection_mailer.rb')
-rw-r--r-- | app/mailers/email_rejection_mailer.rb | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/app/mailers/email_rejection_mailer.rb b/app/mailers/email_rejection_mailer.rb index f29c4e052fc..89aceda82d1 100644 --- a/app/mailers/email_rejection_mailer.rb +++ b/app/mailers/email_rejection_mailer.rb @@ -1,12 +1,4 @@ -class EmailRejectionMailer < ActionMailer::Base - add_template_helper ApplicationHelper - add_template_helper GitlabMarkdownHelper - - helper_method :current_user, :can? - - default from: "#{Gitlab.config.gitlab.email_display_name} <#{Gitlab.config.gitlab.email_from}>" - default reply_to: "#{Gitlab.config.gitlab.email_display_name} <#{Gitlab.config.gitlab.email_reply_to}>" - +class EmailRejectionMailer < BaseMailer def rejection(reason, original_raw, can_retry = false) @reason = reason @original_message = Mail::Message.new(original_raw) @@ -24,12 +16,4 @@ class EmailRejectionMailer < ActionMailer::Base mail(headers) end - - def current_user - nil - end - - def can? - false - end end |