Merge branch '31161-fix-component-path' into 'master'

Fix the path for job log component

See merge request gitlab-org/gitlab!17766

app/assets/javascripts/jobs/components/job_app.vue

@@ -30,7 +30,7 @@ export default {
     EnvironmentsBlock,
     ErasedBlock,
     Icon,
-    Log: () => (isNewJobLogActive() ? import('./job_log_json.vue') : import('./job_log.vue')),
+    Log: () => (isNewJobLogActive() ? import('./log/log.vue') : import('./job_log.vue')),
     LogTopBar,
     StuckBlock,
     UnmetPrerequisitesBlock,

app/assets/javascripts/jobs/components/job_log_json.vue

-<script>
-export default {
-  name: 'JobLogJSON',
-};
-</script>
-<template>
-  <pre>
-    {{ __('This feature is in development. Please disable the `job_log_json` feature flag') }}
-  </pre>
-</template>

locale/gitlab.pot

@@ -16074,9 +16074,6 @@ msgstr ""
 msgid "This environment has no deployments yet."
 msgstr ""
 
-msgid "This feature is in development. Please disable the `job_log_json` feature flag"
-msgstr ""
-
 msgid "This feature requires local storage to be enabled"
 msgstr ""