BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 867b9b43 by Fu Xu
Options

change determine conditions

parent 76463c2c
Showing with 2 additions and 2 deletions
app/mailers/devise_mailer.rb
...@@ -8,7 +8,7 @@ class DeviseMailer < Devise::Mailer ...@@ -8,7 +8,7 @@ class DeviseMailer < Devise::Mailer
def subject_for(key) def subject_for(key)
subject = super 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 subject
end end
end end
app/mailers/notify.rb
...@@ -92,7 +92,7 @@ class Notify < BaseMailer ...@@ -92,7 +92,7 @@ class Notify < BaseMailer
subject = "" subject = ""
subject << "#{@project.name} | " if @project subject << "#{@project.name} | " if @project
subject << extra.join(' | ') if extra.present? 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 subject
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment