diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-11-22 13:44:25 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-11-22 13:44:25 +0800 |
| commit | 7ec8cc121a9db954a3a0b5c8ebfc05cb471823db (patch) | |
| tree | b2fbf58a7d511d6c4bdc4564bdab3d93a3e30f00 /app/views/notify | |
| parent | d20c0682ac4a91f9cdea1d71f9eb515755955c7a (diff) | |
| download | gitlab-ce-7ec8cc121a9db954a3a0b5c8ebfc05cb471823db.tar.gz | |
Move partials to links directory, feedback:fix-failed-email-for-external-jobs
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762971
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/links/ci/builds/_build.html.haml (renamed from app/views/notify/ci/builds/_build.html.haml) | 0 | ||||
| -rw-r--r-- | app/views/notify/links/ci/builds/_build.text.erb (renamed from app/views/notify/ci/builds/_build.text.erb) | 0 | ||||
| -rw-r--r-- | app/views/notify/links/generic_commit_statuses/_generic_commit_status.html.haml (renamed from app/views/notify/generic_commit_statuses/_generic_commit_status.html.haml) | 0 | ||||
| -rw-r--r-- | app/views/notify/links/generic_commit_statuses/_generic_commit_status.text.erb (renamed from app/views/notify/generic_commit_statuses/_generic_commit_status.text.erb) | 0 | ||||
| -rw-r--r-- | app/views/notify/pipeline_failed_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/pipeline_failed_email.text.erb | 2 |
6 files changed, 2 insertions, 2 deletions
diff --git a/app/views/notify/ci/builds/_build.html.haml b/app/views/notify/links/ci/builds/_build.html.haml index 38cd4e5e145..38cd4e5e145 100644 --- a/app/views/notify/ci/builds/_build.html.haml +++ b/app/views/notify/links/ci/builds/_build.html.haml diff --git a/app/views/notify/ci/builds/_build.text.erb b/app/views/notify/links/ci/builds/_build.text.erb index f495a2e5486..f495a2e5486 100644 --- a/app/views/notify/ci/builds/_build.text.erb +++ b/app/views/notify/links/ci/builds/_build.text.erb diff --git a/app/views/notify/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/notify/links/generic_commit_statuses/_generic_commit_status.html.haml index b6563b185b3..b6563b185b3 100644 --- a/app/views/notify/generic_commit_statuses/_generic_commit_status.html.haml +++ b/app/views/notify/links/generic_commit_statuses/_generic_commit_status.html.haml diff --git a/app/views/notify/generic_commit_statuses/_generic_commit_status.text.erb b/app/views/notify/links/generic_commit_statuses/_generic_commit_status.text.erb index 8e89c52a1f3..8e89c52a1f3 100644 --- a/app/views/notify/generic_commit_statuses/_generic_commit_status.text.erb +++ b/app/views/notify/links/generic_commit_statuses/_generic_commit_status.text.erb diff --git a/app/views/notify/pipeline_failed_email.html.haml b/app/views/notify/pipeline_failed_email.html.haml index 58d331acb33..001d9c48555 100644 --- a/app/views/notify/pipeline_failed_email.html.haml +++ b/app/views/notify/pipeline_failed_email.html.haml @@ -158,7 +158,7 @@ %td{style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#8c8c8c;font-weight:500;font-size:15px;vertical-align:middle;"} = 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;"} - = render "notify/#{build.to_partial_path}", pipeline: @pipeline, build: build + = render "notify/links/#{build.to_partial_path}", pipeline: @pipeline, build: build %tr.build-log - if build.has_trace? %td{colspan: "2", style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 0 15px;"} diff --git a/app/views/notify/pipeline_failed_email.text.erb b/app/views/notify/pipeline_failed_email.text.erb index ddb21cc17e8..ab91c7ef350 100644 --- a/app/views/notify/pipeline_failed_email.text.erb +++ b/app/views/notify/pipeline_failed_email.text.erb @@ -19,7 +19,7 @@ Commit Author: <%= commit.author_name %> Pipeline #<%= @pipeline.id %> ( <%= pipeline_url(@pipeline) %> ) had <%= failed.size %> failed <%= 'build'.pluralize(failed.size) %>. <% failed.each do |build| -%> -<%= render "notify/#{build.to_partial_path}", pipeline: @pipeline, build: build %> +<%= render "notify/links/#{build.to_partial_path}", pipeline: @pipeline, build: build %> Stage: <%= build.stage %> Name: <%= build.name %> <% if build.has_trace? -%> |