summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorFu Xu <fuxu@fuxu.name>2016-09-30 21:06:11 +0800
committerFu Xu <fuxu@fuxu.name>2016-10-03 18:07:28 +0800
commit867b9b43472508f0f8cead53b0e9fff89edd9064 (patch)
tree160dd77967c0e7a801711b081c2415a4694b507b /app/mailers
parent76463c2cb460099559b8544396cf1a6656895e8d (diff)
downloadgitlab-ce-867b9b43472508f0f8cead53b0e9fff89edd9064.tar.gz
change determine conditions
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/devise_mailer.rb2
-rw-r--r--app/mailers/notify.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb
index bd4c1c9226a..f7ed61625f4 100644
--- a/app/mailers/devise_mailer.rb
+++ b/app/mailers/devise_mailer.rb
@@ -8,7 +8,7 @@ class DeviseMailer < Devise::Mailer
def subject_for(key)
subject = super
- subject << " | #{Gitlab.config.gitlab.email_subject_suffix}" if Gitlab.config.gitlab.email_subject_suffix.length > 0
+ subject << " | #{Gitlab.config.gitlab.email_subject_suffix}" if Gitlab.config.gitlab.email_subject_suffix.present?
subject
end
end
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 1321b42ddf4..2444702104e 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -92,7 +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 << " | #{Gitlab.config.gitlab.email_subject_suffix}" if Gitlab.config.gitlab.email_subject_suffix.present?
subject
end