diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-12 09:08:38 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-12 09:08:38 +0300 |
commit | d65c0534cecc7e312d2236d23a15e70f476e8d3c (patch) | |
tree | 8e848cd0f6a4400ab5650ec65a27f12e656418b5 /app/views/notify | |
parent | 3d7dae29127eb1813753bc05f6fb18cb223cac21 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
-rw-r--r-- | app/views/notify/autodevops_disabled_email.html.haml | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/app/views/notify/autodevops_disabled_email.html.haml b/app/views/notify/autodevops_disabled_email.html.haml index 72bcfbdf3af..bdf2a1136d3 100644 --- a/app/views/notify/autodevops_disabled_email.html.haml +++ b/app/views/notify/autodevops_disabled_email.html.haml @@ -4,46 +4,40 @@ %tbody %tr %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif; vertical-align: middle; color: #ffffff; text-align: center;" } - Auto DevOps pipeline was disabled for #{@project.name} + = s_('Notify|Auto DevOps pipeline was disabled for %{project}') % { project: @project.name } %tr.pre-section %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif; color: #333333; font-size: 14px; font-weight: 400; line-height: 1.7; padding: 16px 8px 0;" } - The Auto DevOps pipeline failed for pipeline - %a{ href: pipeline_url(@pipeline), style: "color: #1b69b6; text-decoration:none;" } - = "\##{@pipeline.iid}" - and has been disabled for - %a{ href: project_url(@project), style: "color: #1b69b6; text-decoration: none;" } - = @project.name + "." - In order to use the Auto DevOps pipeline with your project, please review the - %a{ href: 'https://docs.gitlab.com/ee/topics/autodevops/#currently-supported-languages', style: "color:#1b69b6;text-decoration:none;" } currently supported languages, - adjust your project accordingly, and turn on the Auto DevOps pipeline within your - %a{ href: project_settings_ci_cd_url(@project), style: "color: #1b69b6; text-decoration: none;" } - CI/CD project settings. + - link_style = "color: #1b69b6; text-decoration:none;" + - pipeline_link = link_to("\##{@pipeline.iid}", pipeline_url(@pipeline), style: link_style).html_safe + - project_link = link_to(@project.name, project_url(@project), style: link_style).html_safe + - supported_langs_link = link_to(s_('Notify|currently supported languages'), 'https://docs.gitlab.com/ee/topics/autodevops/#currently-supported-languages', style: link_style ).html_safe + - settings_link = link_to(s_('Notify|CI/CD project settings'), project_settings_ci_cd_url(@project), style: link_style).html_safe + = s_('Notify|The Auto DevOps pipeline failed for pipeline %{pipeline_link} and has been disabled for %{project_link}. In order to use the Auto DevOps pipeline with your project, please review the %{supported_langs_link}, adjust your project accordingly, and turn on the Auto DevOps pipeline within your %{settings_link}.').html_safe % { pipeline_link: pipeline_link, project_link: project_link, supported_langs_link: supported_langs_link, settings_link: settings_link } %tr.pre-section %td{ style: 'text-align: center;border-bottom:1px solid #ededed' } %a{ href: 'https://docs.gitlab.com/ee/topics/autodevops/', style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" } %button{ type: 'button', style: 'border-color: #dfdfdf; border-style: solid; border-width: 1px; border-radius: 4px; font-size: 14px; padding: 8px 16px; background-color:#fff; margin: 8px 0; cursor: pointer;' } - Learn more about Auto DevOps + = s_('Notify|Learn more about Auto DevOps') %tr.pre-section %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif; color: #333333; font-size: 14px; font-weight: 400; line-height: 1.4; padding: 16px 8px; text-align: center;" } %table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;margin:0 auto;" } %tbody %tr - %td{ style: "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; font-size:14px; font-weight:500;line-height: 1.4; vertical-align: baseline;" } - Pipeline - %a{ href: pipeline_url(@pipeline), style: "color: #1b69b6; text-decoration: none;" } - = "\##{@pipeline.id}" - triggered by + - common_style = "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif;line-height: 1.4;" + - pipeline_link = link_to("\##{@pipeline.id}", pipeline_url(@pipeline), style: "color: #1b69b6; text-decoration: none;").html_safe + %td{ style: "#{common_style} font-size:14px;font-weight:500;vertical-align:baseline;" } + = s_("Notify|Pipeline %{pipeline_link} triggered by").html_safe % { pipeline_link: pipeline_link } - if @pipeline.user - %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif; font-size: 15px; line-height: 1.4; vertical-align: middle; padding-right: 8px; padding-left:8px", width: "24" } - %img.avatar{ height: "24", src: avatar_icon_for_user(@pipeline.user, 24, only_path: false), style: "display: block; border-radius: 12px; margin: -2px 0;", width: "24", alt: "" }/ - %td{ style: "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; font-size: 14px; font-weight: 500; line-height: 1.4; vertical-align: baseline;" } + %td{ style: "#{common_style} font-size: 15px; vertical-align: middle; padding-right: 8px; padding-left:8px", width: "24" } + %img.avatar{ height: "24", src: avatar_icon_for_user(@pipeline.user, 24, only_path: false), style: "display: block; border-radius: 12px; margin: -2px 0;", width: "24", alt: "" } + %td{ style: "#{common_style} font-size: 14px; font-weight: 500; vertical-align: baseline;" } %a.muted{ href: user_url(@pipeline.user), style: "color: #333333; text-decoration: none;" } = @pipeline.user.name - else %td{ style: "font-family: 'Menlo','Liberation Mono','Consolas','DejaVu Sans Mono','Ubuntu Mono','Courier New','andale mono','lucida console',monospace; font-size: 14px; line-height: 1.4; vertical-align: baseline; padding:0 8px;" } - API + = _('API') = render 'notify/failed_builds', pipeline: @pipeline, failed: @pipeline.latest_statuses.failed |