summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorFu Xu <fuxu@fuxu.name>2016-09-30 17:46:37 +0800
committerFu Xu <fuxu@fuxu.name>2016-10-03 18:07:28 +0800
commit76463c2cb460099559b8544396cf1a6656895e8d (patch)
treeb6b11a32e81e8e6373a6e276f99295a530c25f3c /app/mailers
parent064eb2caa671cdd18cd051e49ff2086d004e5516 (diff)
downloadgitlab-ce-76463c2cb460099559b8544396cf1a6656895e8d.tar.gz
override subject method in devise mailer
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/devise_mailer.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb
index 415f6e12885..bd4c1c9226a 100644
--- a/app/mailers/devise_mailer.rb
+++ b/app/mailers/devise_mailer.rb
@@ -3,4 +3,12 @@ class DeviseMailer < Devise::Mailer
default reply_to: Gitlab.config.gitlab.email_reply_to
layout 'devise_mailer'
+
+ protected
+
+ def subject_for(key)
+ subject = super
+ subject << " | #{Gitlab.config.gitlab.email_subject_suffix}" if Gitlab.config.gitlab.email_subject_suffix.length > 0
+ subject
+ end
end