summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2016-11-06 21:27:51 +0200
committerbogdanvlviv <bogdanvlviv@gmail.com>2016-11-06 21:27:51 +0200
commit2b4700b2bee77ef03db53aa06579fd73b242bbe7 (patch)
treec37194bdf3a5162a0fe6b64bdbf654d03001753a /app/mailers
parentc392b0cc24ba40e3fed920c6c693cb24665193af (diff)
downloadgitlab-ce-2b4700b2bee77ef03db53aa06579fd73b242bbe7.tar.gz
Use method helper instead of add_template_helper
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/base_mailer.rb4
-rw-r--r--app/mailers/notify.rb12
2 files changed, 8 insertions, 8 deletions
diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb
index 61a574d3dc0..79c3c2e62c5 100644
--- a/app/mailers/base_mailer.rb
+++ b/app/mailers/base_mailer.rb
@@ -1,6 +1,6 @@
class BaseMailer < ActionMailer::Base
- add_template_helper ApplicationHelper
- add_template_helper GitlabMarkdownHelper
+ helper ApplicationHelper
+ helper GitlabMarkdownHelper
attr_accessor :current_user
helper_method :current_user, :can?
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index eca6ec29767..0bc1c19e9cd 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -10,12 +10,12 @@ class Notify < BaseMailer
include Emails::Pipelines
include Emails::Members
- add_template_helper MergeRequestsHelper
- add_template_helper DiffHelper
- add_template_helper BlobHelper
- add_template_helper EmailsHelper
- add_template_helper MembersHelper
- add_template_helper GitlabRoutingHelper
+ helper MergeRequestsHelper
+ helper DiffHelper
+ helper BlobHelper
+ helper EmailsHelper
+ helper MembersHelper
+ helper GitlabRoutingHelper
def test_email(recipient_email, subject, body)
mail(to: recipient_email,