Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
867b9b43
Commit
867b9b43
authored
Sep 30, 2016
by
Fu Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change determine conditions
parent
76463c2c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
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.
app/mailers/devise_mailer.rb
View file @
867b9b43
...
@@ -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
View file @
867b9b43
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment