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
60caeb14
Commit
60caeb14
authored
Oct 06, 2016
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update subject and email header message
parent
585e0254
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
6 deletions
+8
-6
app/mailers/emails/pipelines.rb
app/mailers/emails/pipelines.rb
+4
-2
app/views/notify/pipeline_failed_email.html.haml
app/views/notify/pipeline_failed_email.html.haml
+1
-1
app/views/notify/pipeline_failed_email.text.erb
app/views/notify/pipeline_failed_email.text.erb
+1
-1
app/views/notify/pipeline_success_email.html.haml
app/views/notify/pipeline_success_email.html.haml
+1
-1
app/views/notify/pipeline_success_email.text.erb
app/views/notify/pipeline_success_email.text.erb
+1
-1
No files found.
app/mailers/emails/pipelines.rb
View file @
60caeb14
...
...
@@ -34,8 +34,10 @@ module Emails
end
def
pipeline_subject
(
status
)
subject
(
"Pipeline
#{
status
}
for
#{
@project
.
name
}
"
,
@pipeline
.
short_sha
)
ref
=
@pipeline
.
short_sha
ref
<<
" in
#{
@merge_request
.
to_reference
}
"
if
@merge_request
subject
(
"Pipeline #
#{
@pipeline
.
id
}
has
#{
status
}
"
,
ref
)
end
end
end
app/views/notify/pipeline_failed_email.html.haml
View file @
60caeb14
...
...
@@ -65,7 +65,7 @@
%td
{
:style
=>
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;padding-right:5px;"
}
%img
{
:alt
=>
"x"
,
:height
=>
"13"
,
:src
=>
image_url
(
'mailers/ci_pipeline_notif_v1/icon-x-red-inverted.gif'
),
:style
=>
"display:block;"
,
:width
=>
"13"
}
/
%td
{
:style
=>
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;"
}
Uh oh, your CI
pipeline has failed.
Your
pipeline has failed.
%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 @
60caeb14
Uh oh, your CI
pipeline has failed.
Your
pipeline has failed.
Project:
<%=
@project
.
name
%>
(
<%=
namespace_project_url
(
@project
.
namespace
,
@project
)
%>
)
Branch:
<%=
@pipeline
.
ref
%>
(
<%=
namespace_project_commits_url
(
@project
.
namespace
,
@project
,
@pipeline
.
ref
)
%>
)
...
...
app/views/notify/pipeline_success_email.html.haml
View file @
60caeb14
...
...
@@ -65,7 +65,7 @@
%td
{
:style
=>
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;padding-right:5px;"
}
%img
{
:alt
=>
"✓"
,
:height
=>
"13"
,
:src
=>
image_url
(
'mailers/ci_pipeline_notif_v1/icon-check-green-inverted.gif'
),
:style
=>
"display:block;"
,
:width
=>
"13"
}
/
%td
{
:style
=>
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;"
}
Success! Your CI
pipeline has passed.
Your
pipeline has passed.
%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 @
60caeb14
Success! Your CI
pipeline has passed.
Your
pipeline has passed.
Project:
<%=
@project
.
name
%>
(
<%=
namespace_project_url
(
@project
.
namespace
,
@project
)
%>
)
Branch:
<%=
@pipeline
.
ref
%>
(
<%=
namespace_project_commits_url
(
@project
.
namespace
,
@project
,
@pipeline
.
ref
)
%>
)
...
...
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