From 7ec8cc121a9db954a3a0b5c8ebfc05cb471823db Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Tue, 22 Nov 2016 13:44:25 +0800 Subject: Move partials to links directory, feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762971 --- app/views/notify/ci/builds/_build.html.haml | 2 -- app/views/notify/ci/builds/_build.text.erb | 1 - .../notify/generic_commit_statuses/_generic_commit_status.html.haml | 1 - .../notify/generic_commit_statuses/_generic_commit_status.text.erb | 1 - app/views/notify/links/ci/builds/_build.html.haml | 2 ++ app/views/notify/links/ci/builds/_build.text.erb | 1 + .../links/generic_commit_statuses/_generic_commit_status.html.haml | 1 + .../links/generic_commit_statuses/_generic_commit_status.text.erb | 1 + app/views/notify/pipeline_failed_email.html.haml | 2 +- app/views/notify/pipeline_failed_email.text.erb | 2 +- 10 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 app/views/notify/ci/builds/_build.html.haml delete mode 100644 app/views/notify/ci/builds/_build.text.erb delete mode 100644 app/views/notify/generic_commit_statuses/_generic_commit_status.html.haml delete mode 100644 app/views/notify/generic_commit_statuses/_generic_commit_status.text.erb create mode 100644 app/views/notify/links/ci/builds/_build.html.haml create mode 100644 app/views/notify/links/ci/builds/_build.text.erb create mode 100644 app/views/notify/links/generic_commit_statuses/_generic_commit_status.html.haml create mode 100644 app/views/notify/links/generic_commit_statuses/_generic_commit_status.text.erb diff --git a/app/views/notify/ci/builds/_build.html.haml b/app/views/notify/ci/builds/_build.html.haml deleted file mode 100644 index 38cd4e5e145..00000000000 --- a/app/views/notify/ci/builds/_build.html.haml +++ /dev/null @@ -1,2 +0,0 @@ -%a{href: pipeline_build_url(pipeline, build), style: "color:#3777b0;text-decoration:none;"} - = build.name diff --git a/app/views/notify/ci/builds/_build.text.erb b/app/views/notify/ci/builds/_build.text.erb deleted file mode 100644 index f495a2e5486..00000000000 --- a/app/views/notify/ci/builds/_build.text.erb +++ /dev/null @@ -1 +0,0 @@ -Build #<%= build.id %> ( <%= pipeline_build_url(pipeline, build) %> ) diff --git a/app/views/notify/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/notify/generic_commit_statuses/_generic_commit_status.html.haml deleted file mode 100644 index b6563b185b3..00000000000 --- a/app/views/notify/generic_commit_statuses/_generic_commit_status.html.haml +++ /dev/null @@ -1 +0,0 @@ -= build.name diff --git a/app/views/notify/generic_commit_statuses/_generic_commit_status.text.erb b/app/views/notify/generic_commit_statuses/_generic_commit_status.text.erb deleted file mode 100644 index 8e89c52a1f3..00000000000 --- a/app/views/notify/generic_commit_statuses/_generic_commit_status.text.erb +++ /dev/null @@ -1 +0,0 @@ -Build #<%= build.id %> diff --git a/app/views/notify/links/ci/builds/_build.html.haml b/app/views/notify/links/ci/builds/_build.html.haml new file mode 100644 index 00000000000..38cd4e5e145 --- /dev/null +++ b/app/views/notify/links/ci/builds/_build.html.haml @@ -0,0 +1,2 @@ +%a{href: pipeline_build_url(pipeline, build), style: "color:#3777b0;text-decoration:none;"} + = build.name diff --git a/app/views/notify/links/ci/builds/_build.text.erb b/app/views/notify/links/ci/builds/_build.text.erb new file mode 100644 index 00000000000..f495a2e5486 --- /dev/null +++ b/app/views/notify/links/ci/builds/_build.text.erb @@ -0,0 +1 @@ +Build #<%= build.id %> ( <%= pipeline_build_url(pipeline, build) %> ) diff --git a/app/views/notify/links/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/notify/links/generic_commit_statuses/_generic_commit_status.html.haml new file mode 100644 index 00000000000..b6563b185b3 --- /dev/null +++ b/app/views/notify/links/generic_commit_statuses/_generic_commit_status.html.haml @@ -0,0 +1 @@ += build.name diff --git a/app/views/notify/links/generic_commit_statuses/_generic_commit_status.text.erb b/app/views/notify/links/generic_commit_statuses/_generic_commit_status.text.erb new file mode 100644 index 00000000000..8e89c52a1f3 --- /dev/null +++ b/app/views/notify/links/generic_commit_statuses/_generic_commit_status.text.erb @@ -0,0 +1 @@ +Build #<%= build.id %> 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? -%> -- cgit v1.2.1