diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 09:07:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 09:07:51 +0000 |
| commit | 914ea32e0efca21436220df2c10e1bfbe4ed3da9 (patch) | |
| tree | e8eb3b97aea2006bd863c586b7ec41d51f654b3b /app/assets/javascripts/jobs/components | |
| parent | 3546e1bb0971347e9e9984de0799e3fb53743b33 (diff) | |
| download | gitlab-ce-914ea32e0efca21436220df2c10e1bfbe4ed3da9.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs/components')
4 files changed, 17 insertions, 9 deletions
diff --git a/app/assets/javascripts/jobs/components/log/duration_badge.vue b/app/assets/javascripts/jobs/components/log/duration_badge.vue index 31a101d2c95..8e5dcdcc902 100644 --- a/app/assets/javascripts/jobs/components/log/duration_badge.vue +++ b/app/assets/javascripts/jobs/components/log/duration_badge.vue @@ -9,7 +9,7 @@ export default { }; </script> <template> - <div class="log-duration-badge rounded align-self-start px-2 ml-2 flex-shrink-0"> + <div class="log-duration-badge rounded align-self-start px-2 ml-2 flex-shrink-0 ws-normal"> {{ duration }} </div> </template> diff --git a/app/assets/javascripts/jobs/components/log/line.vue b/app/assets/javascripts/jobs/components/log/line.vue index 9fae541125e..33ee84bd4ee 100644 --- a/app/assets/javascripts/jobs/components/log/line.vue +++ b/app/assets/javascripts/jobs/components/log/line.vue @@ -21,8 +21,12 @@ export default { <template> <div class="js-line log-line"> <line-number :line-number="line.lineNumber" :path="path" /> - <span v-for="(content, i) in line.content" :key="i" :class="content.style">{{ - content.text - }}</span> + <span + v-for="(content, i) in line.content" + :key="i" + :class="content.style" + class="ws-pre-wrap" + >{{ content.text }}</span + > </div> </template> diff --git a/app/assets/javascripts/jobs/components/log/line_header.vue b/app/assets/javascripts/jobs/components/log/line_header.vue index 92cf3b3cf5f..85ccd5996b5 100644 --- a/app/assets/javascripts/jobs/components/log/line_header.vue +++ b/app/assets/javascripts/jobs/components/log/line_header.vue @@ -43,15 +43,19 @@ export default { <template> <div - class="log-line collapsible-line d-flex justify-content-between" + class="log-line collapsible-line d-flex justify-content-between ws-normal" role="button" @click="handleOnClick" > <icon :name="iconName" class="arrow position-absolute" /> <line-number :line-number="line.lineNumber" :path="path" /> - <span v-for="(content, i) in line.content" :key="i" class="line-text" :class="content.style">{{ - content.text - }}</span> + <span + v-for="(content, i) in line.content" + :key="i" + class="line-text w-100 ws-pre-wrap" + :class="content.style" + >{{ content.text }}</span + > <duration-badge v-if="duration" :duration="duration" /> </div> </template> diff --git a/app/assets/javascripts/jobs/components/log/line_number.vue b/app/assets/javascripts/jobs/components/log/line_number.vue index 08c4a7ed330..ae96c32874b 100644 --- a/app/assets/javascripts/jobs/components/log/line_number.vue +++ b/app/assets/javascripts/jobs/components/log/line_number.vue @@ -48,7 +48,7 @@ export default { <template> <gl-link :id="lineNumberId" - class="d-inline-block text-right line-number" + class="d-inline-block text-right line-number flex-shrink-0" :href="buildLineNumber" >{{ parsedLineNumber }}</gl-link > |