diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-01 21:06:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-01 21:06:28 +0300 |
| commit | ed3b1698883bd4ac2c4faf6c05c3a8155748bf91 (patch) | |
| tree | e4725e36aaee9141e9ac4da66faf8a19edd74c2a /app/assets/javascripts/jobs | |
| parent | 05f4b2fb34dbb051b2ce5ddbc801ec42998c019c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
| -rw-r--r-- | app/assets/javascripts/jobs/components/job_app.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/jobs/components/job_log_json.vue | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index 36701a95673..b4b124d5db1 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/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, diff --git a/app/assets/javascripts/jobs/components/job_log_json.vue b/app/assets/javascripts/jobs/components/job_log_json.vue deleted file mode 100644 index 2198b20eb8f..00000000000 --- a/app/assets/javascripts/jobs/components/job_log_json.vue +++ /dev/null @@ -1,10 +0,0 @@ -<script> -export default { - name: 'JobLogJSON', -}; -</script> -<template> - <pre> - {{ __('This feature is in development. Please disable the `job_log_json` feature flag') }} - </pre> -</template> |