diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 12:09:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 12:09:03 +0000 |
| commit | 5366964a10484c2783a646b35a6da9eece01b242 (patch) | |
| tree | 4a5a7a289d44e63d96a50a6a64db6e16b871f19c /app/views/notify | |
| parent | 733befe96ad19f5a02e442c4a9cc8059d3aabbda (diff) | |
| download | gitlab-ce-5366964a10484c2783a646b35a6da9eece01b242.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/_failed_builds.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/autodevops_disabled_email.text.erb | 2 | ||||
| -rw-r--r-- | app/views/notify/pipeline_failed_email.text.erb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/notify/_failed_builds.html.haml b/app/views/notify/_failed_builds.html.haml index 7c563bb016c..1711c34a842 100644 --- a/app/views/notify/_failed_builds.html.haml +++ b/app/views/notify/_failed_builds.html.haml @@ -27,6 +27,6 @@ - if build.has_trace? %td{ colspan: "2", style: "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; padding: 0 0 16px;" } %pre{ style: "font-family: Monaco,'Lucida Console','Courier New',Courier,monospace; background-color: #fafafa; border-radius: 4px; overflow: hidden; white-space: pre-wrap; word-break: break-all; font-size:13px; line-height: 1.4; padding: 16px 8px; color: #333333; margin: 0;" } - = build.trace.html(last_lines: 10).html_safe + = build.trace.html(last_lines: 30).html_safe - else %td{ colspan: "2" } diff --git a/app/views/notify/autodevops_disabled_email.text.erb b/app/views/notify/autodevops_disabled_email.text.erb index bf863952478..91092060e74 100644 --- a/app/views/notify/autodevops_disabled_email.text.erb +++ b/app/views/notify/autodevops_disabled_email.text.erb @@ -15,6 +15,6 @@ had <%= failed.size %> failed <%= 'build'.pluralize(failed.size) %>. Stage: <%= build.stage %> Name: <%= build.name %> <% if build.has_trace? -%> - Trace: <%= build.trace.raw(last_lines: 10) %> + Trace: <%= build.trace.raw(last_lines: 30) %> <% end -%> <% end -%> diff --git a/app/views/notify/pipeline_failed_email.text.erb b/app/views/notify/pipeline_failed_email.text.erb index 9cd479ef1e6..41b26842dbc 100644 --- a/app/views/notify/pipeline_failed_email.text.erb +++ b/app/views/notify/pipeline_failed_email.text.erb @@ -35,7 +35,7 @@ had <%= failed.size %> failed <%= 'build'.pluralize(failed.size) %>. Stage: <%= build.stage %> Name: <%= build.name %> <% if build.has_trace? -%> -Trace: <%= build.trace.raw(last_lines: 10) %> +Trace: <%= build.trace.raw(last_lines: 30) %> <% end -%> <% end -%> |