change determine conditions

867b9b43 · Fu Xu · 76463c2c · 867b9b43 · 867b9b43
Commit 867b9b43 authored Sep 30, 2016 by Fu Xu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/mailers/devise_mailer.rb app/mailers/devise_mailer.rb +1 -1

app/mailers/notify.rb app/mailers/notify.rb +1 -1

No files found.
--- 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
--- 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