summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-04-05 16:38:10 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2017-06-13 22:36:45 +0200
commitb0e0bfc8e72e82b6e2d5f4e9a2e41b4000080b6c (patch)
treee671b009df1cfb531a18470752c9101dac4e3bef /app/mailers
parent2fbe116c228b2768167ffcc16159b803ccf82ba6 (diff)
downloadgitlab-ce-b0e0bfc8e72e82b6e2d5f4e9a2e41b4000080b6c.tar.gz
use common layout for devise mailer
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/devise_mailer.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb
index f7ed61625f4..d152cb912af 100644
--- a/app/mailers/devise_mailer.rb
+++ b/app/mailers/devise_mailer.rb
@@ -2,7 +2,9 @@ class DeviseMailer < Devise::Mailer
default from: "#{Gitlab.config.gitlab.email_display_name} <#{Gitlab.config.gitlab.email_from}>"
default reply_to: Gitlab.config.gitlab.email_reply_to
- layout 'devise_mailer'
+ layout 'mailer'
+
+ helper EmailsHelper
protected