fix some remaining links
This commit is contained in:
parent
db3fe3109a
commit
bbd7597d40
1 changed files with 12 additions and 7 deletions
|
@ -116,11 +116,16 @@
|
||||||
%table.img{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "border-collapse:collapse;"}
|
%table.img{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "border-collapse:collapse;"}
|
||||||
%tbody
|
%tbody
|
||||||
%tr
|
%tr
|
||||||
|
- commit = @pipeline.commit
|
||||||
%td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;padding-right:5px;"}
|
%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 => "{{{commit-author-avatar-url}}}", :style => "display:block;border-radius:12px;margin:-2px 0;", :width => "24"}/
|
%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;"}
|
%td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:15px;line-height:1.4;vertical-align:middle;"}
|
||||||
%a.muted{:href => "{{{commit-author-link}}}", :style => "color:#333333;text-decoration:none;"}
|
- if commit.author.nil?
|
||||||
= @pipeline.git_author_name
|
%span
|
||||||
|
= commit.author_name
|
||||||
|
- else
|
||||||
|
%a.muted{:href => user_path(commit.author), :style => "color:#333333;text-decoration:none;"}
|
||||||
|
= commit.author.try(:name) || commit.author_name
|
||||||
%tr.spacer
|
%tr.spacer
|
||||||
%td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;"}
|
%td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;"}
|
||||||
|
|
||||||
|
@ -128,7 +133,7 @@
|
||||||
%tr.pre-section
|
%tr.pre-section
|
||||||
%td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333333;font-size:15px;font-weight:400;line-height:1.4;padding:15px 0;"}
|
%td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333333;font-size:15px;font-weight:400;line-height:1.4;padding:15px 0;"}
|
||||||
Pipeline
|
Pipeline
|
||||||
%a{:href => "{{{pipline-link}}}", :style => "color:#3084bb;text-decoration:none;"}
|
%a{:href => namespace_project_pipeline_url(@project.namespace, @project, @pipeline.id), :style => "color:#3084bb;text-decoration:none;"}
|
||||||
= "\##{@pipeline.id}"
|
= "\##{@pipeline.id}"
|
||||||
had
|
had
|
||||||
= failed.size
|
= failed.size
|
||||||
|
@ -152,7 +157,7 @@
|
||||||
%td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#8c8c8c;font-weight:500;font-size:15px;vertical-align:middle;"}
|
%td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#8c8c8c;font-weight:500;font-size:15px;vertical-align:middle;"}
|
||||||
= build.stage
|
= build.stage
|
||||||
%td{:align => "right", :style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:20px 0;color:#8c8c8c;font-weight:500;font-size:15px;"}
|
%td{:align => "right", :style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:20px 0;color:#8c8c8c;font-weight:500;font-size:15px;"}
|
||||||
%a{:href => "{{{pipeline-build-link}}}", :style => "color:#3084bb;text-decoration:none;"}
|
%a{:href => namespace_project_build_url(@project.namespace, @project, build.id), :style => "color:#3084bb;text-decoration:none;"}
|
||||||
= build.name
|
= build.name
|
||||||
%tr.build-log
|
%tr.build-log
|
||||||
%td{:colspan => "2", :style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 0 15px;"}
|
%td{:colspan => "2", :style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 0 15px;"}
|
||||||
|
@ -162,7 +167,7 @@
|
||||||
%td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;"}
|
%td{:style => "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;"}
|
||||||
%img{:alt => "GitLab", :height => "33", :src => image_url('mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'), :style => "display:block;margin:0 auto 1em;", :width => "90"}/
|
%img{:alt => "GitLab", :height => "33", :src => image_url('mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'), :style => "display:block;margin:0 auto 1em;", :width => "90"}/
|
||||||
%div
|
%div
|
||||||
%a{:href => "{{{manage-notifications-link}}}", :style => "color:#3084bb;text-decoration:none;"} Manage all notifications
|
%a{:href => profile_notifications_url, :style => "color:#3084bb;text-decoration:none;"} Manage all notifications
|
||||||
·
|
·
|
||||||
%a{:href => "{{{help-link}}}", :style => "color:#3084bb;text-decoration:none;"} Help
|
%a{:href => help_url, :style => "color:#3084bb;text-decoration:none;"} Help
|
||||||
%div GitLab, 1233 Howard St 2F, San Francisco, CA 94103, USA
|
%div GitLab, 1233 Howard St 2F, San Francisco, CA 94103, USA
|
||||||
|
|
Loading…
Reference in a new issue