diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-10-05 16:48:12 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-10-05 16:48:12 -0500 |
| commit | 0af5e3d50bd5492da1293070f6a93baf1f65833d (patch) | |
| tree | f513fed98f008b6640c597d1ea1d2ef8d222ae82 /app/views/notify/pipeline_failed_email.html.haml | |
| parent | 0cc3fc562738b88875e9ab2e871fdd64cc616705 (diff) | |
| download | gitlab-ce-0af5e3d50bd5492da1293070f6a93baf1f65833d.tar.gz | |
move merge request link next to the commit sha and expose reference number
Diffstat (limited to 'app/views/notify/pipeline_failed_email.html.haml')
| -rw-r--r-- | app/views/notify/pipeline_failed_email.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/notify/pipeline_failed_email.html.haml b/app/views/notify/pipeline_failed_email.html.haml index 6b013055d45..fe6c526ec0d 100644 --- a/app/views/notify/pipeline_failed_email.html.haml +++ b/app/views/notify/pipeline_failed_email.html.haml @@ -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 |