Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-10-12 20:43:23 +0300
committerLin Jen-Shin <godfat@godfat.org>2016-10-12 20:45:46 +0300
commit16e6431c83af0a3c862a0e306f1810774033a6bb (patch)
treedc047cb61829f0ac19e3a7543a6772122c513065 /app/views/notify/pipeline_failed_email.html.haml
parentc33e2f0ae923a5f84218a47ef111a1bc87cbb27f (diff)
Use helpers from GitlabRoutingHelper, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019#note_16832930 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019#note_16832936 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019#note_16833033
Diffstat (limited to 'app/views/notify/pipeline_failed_email.html.haml')
-rw-r--r--app/views/notify/pipeline_failed_email.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/notify/pipeline_failed_email.html.haml b/app/views/notify/pipeline_failed_email.html.haml
index 89cbcba67e5..e76411755e7 100644
--- a/app/views/notify/pipeline_failed_email.html.haml
+++ b/app/views/notify/pipeline_failed_email.html.haml
@@ -83,7 +83,7 @@
%a.muted{href: user_url(@project.namespace.owner), style: "color:#333333;text-decoration:none;"}
= @project.namespace.owner.name
\/
- %a.muted{href: namespace_project_url(@project.namespace, @project), style: "color:#333333;text-decoration:none;"}
+ %a.muted{href: project_url(@project), style: "color:#333333;text-decoration:none;"}
= @project.name
%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;"} Branch
@@ -109,7 +109,7 @@
= @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;"}
+ %a{href: merge_request_url(@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)