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
Tatuya Kamada
gitlab-ce
Commits
36aea928
Commit
36aea928
authored
Oct 13, 2016
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
invert if statement order
parent
5c36905a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
app/views/notify/pipeline_failed_email.html.haml
app/views/notify/pipeline_failed_email.html.haml
+4
-4
app/views/notify/pipeline_failed_email.text.erb
app/views/notify/pipeline_failed_email.text.erb
+3
-3
app/views/notify/pipeline_success_email.html.haml
app/views/notify/pipeline_success_email.html.haml
+4
-4
app/views/notify/pipeline_success_email.text.erb
app/views/notify/pipeline_success_email.text.erb
+3
-3
No files found.
app/views/notify/pipeline_failed_email.html.haml
View file @
36aea928
...
...
@@ -121,12 +121,12 @@
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;"
}
%img
.avatar
{
height:
"24"
,
src:
avatar_icon
(
commit
.
author
||
commit
.
author_email
,
24
),
style:
"display:block;border-radius:12px;margin:-2px 0;"
,
width:
"24"
}
/
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;"
}
-
if
commit
.
author
.
nil?
%span
=
commit
.
author_name
-
else
-
if
commit
.
author
%a
.muted
{
href:
user_url
(
commit
.
author
),
style:
"color:#333333;text-decoration:none;"
}
=
commit
.
author
.
name
-
else
%span
=
commit
.
author_name
%tr
.spacer
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;"
}
...
...
app/views/notify/pipeline_failed_email.text.erb
View file @
36aea928
...
...
@@ -9,10 +9,10 @@ Merge Request: <%= @merge_request.to_reference %> ( <%= merge_request_url(@merge
Commit:
<%=
@pipeline
.
short_sha
%>
(
<%=
namespace_project_commit_url
(
@project
.
namespace
,
@project
,
@pipeline
.
sha
)
%>
)
Commit Message:
<%=
@pipeline
.
git_commit_message
.
truncate
(
50
)
%>
<%
commit
=
@pipeline
.
commit
-%>
<%
if
commit
.
author
.
nil?
-%>
Commit Author:
<%=
commit
.
author_name
%>
<%
else
-%>
<%
if
commit
.
author
-%>
Commit Author:
<%=
commit
.
author
.
name
%>
(
<%=
user_url
(
commit
.
author
)
%>
)
<%
else
-%>
Commit Author:
<%=
commit
.
author_name
%>
<%
end
-%>
<%
failed
=
@pipeline
.
statuses
.
latest
.
failed
-%>
...
...
app/views/notify/pipeline_success_email.html.haml
View file @
36aea928
...
...
@@ -121,12 +121,12 @@
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;"
}
%img
.avatar
{
height:
"24"
,
src:
avatar_icon
(
commit
.
author
||
commit
.
author_email
,
24
),
style:
"display:block;border-radius:12px;margin:-2px 0;"
,
width:
"24"
}
/
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;"
}
-
if
commit
.
author
.
nil?
%span
=
commit
.
author_name
-
else
-
if
commit
.
author
%a
.muted
{
href:
user_url
(
commit
.
author
),
style:
"color:#333333;text-decoration:none;"
}
=
commit
.
author
.
name
-
else
%span
=
commit
.
author_name
%tr
.spacer
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;"
}
...
...
app/views/notify/pipeline_success_email.text.erb
View file @
36aea928
...
...
@@ -9,10 +9,10 @@ Merge Request: <%= @merge_request.to_reference %> ( <%= merge_request_url(@merge
Commit:
<%=
@pipeline
.
short_sha
%>
(
<%=
namespace_project_commit_url
(
@project
.
namespace
,
@project
,
@pipeline
.
sha
)
%>
)
Commit Message:
<%=
@pipeline
.
git_commit_message
.
truncate
(
50
)
%>
<%
commit
=
@pipeline
.
commit
-%>
<%
if
commit
.
author
.
nil?
-%>
Commit Author:
<%=
commit
.
author_name
%>
<%
else
-%>
<%
if
commit
.
author
-%>
Commit Author:
<%=
commit
.
author
.
name
%>
(
<%=
user_url
(
commit
.
author
)
%>
)
<%
else
-%>
Commit Author:
<%=
commit
.
author_name
%>
<%
end
-%>
<%
build_count
=
@pipeline
.
statuses
.
latest
.
size
-%>
...
...
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