diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-09-26 17:18:30 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-09-26 17:18:30 +0800 |
| commit | db6b2b18990297d98bd74af1d2f475d0d42ec443 (patch) | |
| tree | 0320d3bd05b0c1ea5d9c6d5c5b6d053e0a8ae42c | |
| parent | 8de8506d44de76af4f00ca50283ff46d005a00ab (diff) | |
| download | gitlab-ce-db6b2b18990297d98bd74af1d2f475d0d42ec443.tar.gz | |
Show open merge request against default branch if exists
| -rw-r--r-- | app/mailers/emails/pipelines.rb | 4 | ||||
| -rw-r--r-- | app/views/notify/pipeline_failed_email.html.haml | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/mailers/emails/pipelines.rb b/app/mailers/emails/pipelines.rb index e132105807a..2b2b7a4f08c 100644 --- a/app/mailers/emails/pipelines.rb +++ b/app/mailers/emails/pipelines.rb @@ -13,6 +13,10 @@ module Emails def pipeline_mail(pipeline, to, status) @project = pipeline.project @pipeline = pipeline + @merge_request = @project.merge_requests.opened. + find_by(source_project: @project, + source_branch: @pipeline.ref, + target_branch: @project.default_branch) add_headers mail(to: to, subject: pipeline_subject(status)) diff --git a/app/views/notify/pipeline_failed_email.html.haml b/app/views/notify/pipeline_failed_email.html.haml index 3a85d4831f8..6b013055d45 100644 --- a/app/views/notify/pipeline_failed_email.html.haml +++ b/app/views/notify/pipeline_failed_email.html.haml @@ -94,9 +94,10 @@ %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 - ( - %a{:href => "{{{merge-request-link}}}", :style => "color:#3084bb;text-decoration:none;white-space: nowrap;"}> merge request - ) + - 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;"} |