kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Lin Jen-Shin 2016-10-13 01:43:23 +08:00
parent c33e2f0ae9
commit 16e6431c83
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/notify/pipeline_failed_email.html.haml
View File

@ -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)

4
app/views/notify/pipeline_failed_email.text.erb
View File

@ -1,9 +1,9 @@
Your pipeline has failed.
Project: <%= @project.name %> ( <%= namespace_project_url(@project.namespace, @project) %> )
Project: <%= @project.name %> ( <%= project_url(@project) %> )
Branch: <%= @pipeline.ref %> ( <%= namespace_project_commits_url(@project.namespace, @project, @pipeline.ref) %> )
<% if @merge_request -%>
Merge Request: <%= @merge_request.to_reference %> ( <%= namespace_project_merge_request_url(@project.namespace, @project, @merge_request) %> )
Merge Request: <%= @merge_request.to_reference %> ( <%= merge_request_url(@merge_request) %> )
<% end -%>
Commit: <%= @pipeline.short_sha %> ( <%= namespace_project_commit_url(@project.namespace, @project, @pipeline.sha) %> )

4
app/views/notify/pipeline_success_email.html.haml
View File

@ -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)

4
app/views/notify/pipeline_success_email.text.erb
View File

@ -1,9 +1,9 @@
Your pipeline has passed.
Project: <%= @project.name %> ( <%= namespace_project_url(@project.namespace, @project) %> )
Project: <%= @project.name %> ( <%= project_url(@project) %> )
Branch: <%= @pipeline.ref %> ( <%= namespace_project_commits_url(@project.namespace, @project, @pipeline.ref) %> )
<% if @merge_request -%>
Merge Request: <%= @merge_request.to_reference %> ( <%= namespace_project_merge_request_url(@project.namespace, @project, @merge_request) %> )
Merge Request: <%= @merge_request.to_reference %> ( <%= merge_request_url(@merge_request) %> )
<% end -%>
Commit: <%= @pipeline.short_sha %> ( <%= namespace_project_commit_url(@project.namespace, @project, @pipeline.sha) %> )