diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-03 21:08:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-03 21:08:29 +0300 |
| commit | 592223823c8ebf6e32d98e4b12620ba8ff043cca (patch) | |
| tree | 1c665b754b1487df374d9cb28cfc61ff40a6b317 /app/assets/javascripts/jobs | |
| parent | 0e13b2c71563d578805fc01fda9a4361f9f9d053 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
| -rw-r--r-- | app/assets/javascripts/jobs/components/log/line.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/jobs/components/log/line_header.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/jobs/components/log/line.vue b/app/assets/javascripts/jobs/components/log/line.vue index 48f669ae8ed..e68d5b8eda4 100644 --- a/app/assets/javascripts/jobs/components/log/line.vue +++ b/app/assets/javascripts/jobs/components/log/line.vue @@ -20,7 +20,7 @@ export default { return h( 'span', { - class: ['ws-pre-wrap', content.style], + class: ['gl-white-space-pre-wrap', content.style], }, content.text, ); diff --git a/app/assets/javascripts/jobs/components/log/line_header.vue b/app/assets/javascripts/jobs/components/log/line_header.vue index dbd16d55886..4c1c00cb2a7 100644 --- a/app/assets/javascripts/jobs/components/log/line_header.vue +++ b/app/assets/javascripts/jobs/components/log/line_header.vue @@ -52,7 +52,7 @@ export default { <span v-for="(content, i) in line.content" :key="i" - class="line-text w-100 ws-pre-wrap" + class="line-text w-100 gl-white-space-pre-wrap" :class="content.style" >{{ content.text }}</span > |