diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 14:37:34 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 14:37:34 +0200 |
| commit | 90c338a49541c95452181af9e0d0bcf9da6c51ad (patch) | |
| tree | bdf4633d8e52fde86cdb956d8b6f2681190ff8b7 /app/mailers | |
| parent | cc4ef4da11d46761ab0ce4fbd6b032a7e01baba9 (diff) | |
| download | gitlab-ce-90c338a49541c95452181af9e0d0bcf9da6c51ad.tar.gz | |
Move helpers back to original directory
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/base_mailer.rb | 4 | ||||
| -rw-r--r-- | app/mailers/notify.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb index 2b650bc6eac..aedb0889185 100644 --- a/app/mailers/base_mailer.rb +++ b/app/mailers/base_mailer.rb @@ -1,6 +1,6 @@ class BaseMailer < ActionMailer::Base - add_template_helper Gitlab::ApplicationHelper - add_template_helper Gitlab::GitlabMarkdownHelper + add_template_helper ApplicationHelper + add_template_helper GitlabMarkdownHelper attr_accessor :current_user helper_method :current_user, :can? diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 38afb49c78c..f196ffd53f3 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -8,8 +8,8 @@ class Notify < BaseMailer include Emails::Profile include Emails::Groups - add_template_helper Gitlab::MergeRequestsHelper - add_template_helper Gitlab::EmailsHelper + add_template_helper MergeRequestsHelper + add_template_helper EmailsHelper def test_email(recipient_email, subject, body) mail(to: recipient_email, @@ -100,7 +100,7 @@ class Notify < BaseMailer def mail_thread(model, headers = {}) if @project - headers['X-GitLab-Project'] = @project.name + headers['X-GitLab-Project'] = @project.name headers['X-GitLab-Project-Id'] = @project.id headers['X-GitLab-Project-Path'] = @project.path_with_namespace end |