Commit c2889d55 authored by Filipa Lacerda's avatar Filipa Lacerda

Rename trace to log in the UI

parent c8f5576c
...@@ -4,12 +4,12 @@ module BuildsHelper ...@@ -4,12 +4,12 @@ module BuildsHelper
def build_summary(build, skip: false) def build_summary(build, skip: false)
if build.has_trace? if build.has_trace?
if skip if skip
link_to _("View job trace"), pipeline_job_url(build.pipeline, build) link_to _("View job log"), pipeline_job_url(build.pipeline, build)
else else
build.trace.html(last_lines: 10).html_safe build.trace.html(last_lines: 10).html_safe
end end
else else
_("No job trace") _("No job log")
end end
end end
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
%li= desc %li= desc
%p= _('The following items will NOT be exported:') %p= _('The following items will NOT be exported:')
%ul %ul
%li= _('Job traces and artifacts') %li= _('Job logs and artifacts')
%li= _('Container registry images') %li= _('Container registry images')
%li= _('CI variables') %li= _('CI variables')
%li= _('Webhooks') %li= _('Webhooks')
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
%span.input-group-append %span.input-group-append
.input-group-text / .input-group-text /
%p.form-text.text-muted %p.form-text.text-muted
= _("A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable") = _("A regular expression that will be used to find the test coverage output in the job log. Leave blank to disable")
= link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'test-coverage-parsing'), target: '_blank' = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'test-coverage-parsing'), target: '_blank'
.bs-callout.bs-callout-info .bs-callout.bs-callout-info
%p= _("Below are examples of regex for existing tools:") %p= _("Below are examples of regex for existing tools:")
......
---
title: Replace wording trace with log
merge_request:
author:
type: changed
...@@ -686,7 +686,7 @@ msgstr "" ...@@ -686,7 +686,7 @@ msgstr ""
msgid "A ready-to-go template for use with iOS Swift apps." msgid "A ready-to-go template for use with iOS Swift apps."
msgstr "" msgstr ""
msgid "A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable" msgid "A regular expression that will be used to find the test coverage output in the job log. Leave blank to disable"
msgstr "" msgstr ""
msgid "A secure token that identifies an external storage request." msgid "A secure token that identifies an external storage request."
...@@ -9339,7 +9339,7 @@ msgstr "" ...@@ -9339,7 +9339,7 @@ msgstr ""
msgid "Job is stuck. Check runners." msgid "Job is stuck. Check runners."
msgstr "" msgstr ""
msgid "Job traces and artifacts" msgid "Job logs and artifacts"
msgstr "" msgstr ""
msgid "Job was retried" msgid "Job was retried"
...@@ -10992,7 +10992,7 @@ msgstr "" ...@@ -10992,7 +10992,7 @@ msgstr ""
msgid "No issues for the selected time period." msgid "No issues for the selected time period."
msgstr "" msgstr ""
msgid "No job trace" msgid "No job log"
msgstr "" msgstr ""
msgid "No jobs to show" msgid "No jobs to show"
...@@ -18390,7 +18390,7 @@ msgstr "" ...@@ -18390,7 +18390,7 @@ msgstr ""
msgid "View job" msgid "View job"
msgstr "" msgstr ""
msgid "View job trace" msgid "View job log"
msgstr "" msgstr ""
msgid "View jobs" msgid "View jobs"
......
...@@ -778,10 +778,10 @@ describe 'Pipeline', :js do ...@@ -778,10 +778,10 @@ describe 'Pipeline', :js do
expect(page).to have_content(failed_build.stage) expect(page).to have_content(failed_build.stage)
end end
it 'does not show trace' do it 'does not show log' do
subject subject
expect(page).to have_content('No job trace') expect(page).to have_content('No job log')
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment