summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFu Xu <fuxu@fuxu.name>2016-09-02 16:57:08 +0800
committerFu Xu <fuxu@fuxu.name>2016-10-03 18:07:28 +0800
commit74c8e091f40c29a59b99bf7864b9fee303c68e50 (patch)
tree48d65f3bad5d39656840526ef1720ee1e93335de /app
parent7134599860651cc0f502581c97853a26f2fb4471 (diff)
downloadgitlab-ce-74c8e091f40c29a59b99bf7864b9fee303c68e50.tar.gz
add configurable email subject suffix
Diffstat (limited to 'app')
-rw-r--r--app/mailers/notify.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 29f1c527776..1321b42ddf4 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -92,6 +92,7 @@ class Notify < BaseMailer
subject = ""
subject << "#{@project.name} | " if @project
subject << extra.join(' | ') if extra.present?
+ subject << " | #{Gitlab.config.gitlab.email_subject_suffix}" if Gitlab.config.gitlab.email_subject_suffix.length > 0
subject
end