Merge branch '29121-rename-trace' into 'master'

Rename trace to log in the UI

Closes #29121

See merge request gitlab-org/gitlab!18865

app/helpers/builds_helper.rb

@@ -4,12 +4,12 @@ module BuildsHelper
   def build_summary(build, skip: false)
     if build.has_trace?
       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
         build.trace.html(last_lines: 10).html_safe
       end
     else
-      _("No job trace")
+      _("No job log")
     end
   end
 

app/views/projects/_export.html.haml

@@ -14,7 +14,7 @@
           %li= desc
       %p= _('The following items will NOT be exported:')
       %ul
-        %li= _('Job traces and artifacts')
+        %li= _('Job logs and artifacts')
         %li= _('Container registry images')
         %li= _('CI variables')
         %li= _('Webhooks')

app/views/projects/settings/ci_cd/_form.html.haml

@@ -98,7 +98,7 @@
             %span.input-group-append
               .input-group-text /
           %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'
           .bs-callout.bs-callout-info
             %p= _("Below are examples of regex for existing tools:")

changelogs/unreleased/29121-rename-trace.yml

+---
+title: Replace wording trace with log
+merge_request:
+author:
+type: changed

locale/gitlab.pot

@@ -686,7 +686,7 @@ msgstr ""
 msgid "A ready-to-go template for use with iOS Swift apps."
 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 ""
 
 msgid "A secure token that identifies an external storage request."
@@ -9342,7 +9342,7 @@ msgstr ""
 msgid "Job is stuck. Check runners."
 msgstr ""
 
-msgid "Job traces and artifacts"
+msgid "Job logs and artifacts"
 msgstr ""
 
 msgid "Job was retried"
@@ -10995,7 +10995,7 @@ msgstr ""
 msgid "No issues for the selected time period."
 msgstr ""
 
-msgid "No job trace"
+msgid "No job log"
 msgstr ""
 
 msgid "No jobs to show"
@@ -18393,7 +18393,7 @@ msgstr ""
 msgid "View job"
 msgstr ""
 
-msgid "View job trace"
+msgid "View job log"
 msgstr ""
 
 msgid "View jobs"

spec/features/projects/pipelines/pipeline_spec.rb

@@ -778,10 +778,10 @@ describe 'Pipeline', :js do
         expect(page).to have_content(failed_build.stage)
       end
 
-      it 'does not show trace' do
+      it 'does not show log' do
         subject
 
-        expect(page).to have_content('No job trace')
+        expect(page).to have_content('No job log')
       end
     end