BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
0af5e3d5
Commit
0af5e3d5
authored
Oct 05, 2016
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move merge request link next to the commit sha and expose reference number
parent
0cc3fc56
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
pipeline_failed_email.html.haml
app/views/notify/pipeline_failed_email.html.haml
+4
-4
No files found.
app/views/notify/pipeline_failed_email.html.haml
View file @
0af5e3d5
...
...
@@ -94,10 +94,6 @@
%td
{
:style
=>
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;"
}
%a
.muted
{
:href
=>
namespace_project_commits_url
(
@project
.
namespace
,
@project
,
@pipeline
.
ref
),
:style
=>
"color:#333333;text-decoration:none;"
}
=
@pipeline
.
ref
-
if
@merge_request
(
%a
{
:href
=>
namespace_project_merge_request_url
(
@project
.
namespace
,
@project
,
@merge_request
),
:style
=>
"color:#3084bb;text-decoration:none;white-space: nowrap;"
}>
merge request
)
%tr
%td
{
:style
=>
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;border-top:1px solid #ededed;"
}
Commit
%td
{
:style
=>
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;color:#8c8c8c;font-weight:300;padding:14px 0;margin:0;color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;"
}
...
...
@@ -109,6 +105,10 @@
%td
{
:style
=>
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;"
}
%a
{
:href
=>
namespace_project_commit_url
(
@project
.
namespace
,
@project
,
@pipeline
.
sha
),
:style
=>
"color:#3084bb;text-decoration:none;"
}
=
@pipeline
.
short_sha
-
if
@merge_request
in
%a
{
:href
=>
namespace_project_merge_request_url
(
@project
.
namespace
,
@project
,
@merge_request
),
:style
=>
"color:#3084bb;text-decoration:none;"
}
=
@merge_request
.
to_reference
.commit
{
:style
=>
"color:#5c5c5c;font-weight:300;"
}
=
@pipeline
.
git_commit_message
.
truncate
(
50
)
%tr
...
...
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