diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-11 00:08:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-11 00:08:51 +0300 |
| commit | 13bcb8221306526671a61df589f7c05505c9934c (patch) | |
| tree | baa61780ec5f526ea180c209af8f4d75a5cb4425 /app/assets/javascripts/vue_shared/components/runner_instructions | |
| parent | 206b03aeae3a368983ac3d6ad5e5828030bbaacd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/runner_instructions')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/runner_instructions/runner_instructions.vue | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/runner_instructions/runner_instructions.vue b/app/assets/javascripts/vue_shared/components/runner_instructions/runner_instructions.vue index 995922454c4..b70b1277155 100644 --- a/app/assets/javascripts/vue_shared/components/runner_instructions/runner_instructions.vue +++ b/app/assets/javascripts/vue_shared/components/runner_instructions/runner_instructions.vue @@ -179,7 +179,10 @@ export default { </template> <template v-if="!instructionsEmpty"> <div class="gl-display-flex"> - <pre class="bg-light gl-flex-fill-1" data-testid="binary-instructions"> + <pre + class="bg-light gl-flex-fill-1 gl-white-space-pre-line" + data-testid="binary-instructions" + > {{ instructions.installInstructions }} </pre> <gl-button @@ -196,7 +199,10 @@ export default { <h5 class="gl-mb-5">{{ $options.i18n.registerRunner }}</h5> <h5 class="gl-mb-5">{{ $options.i18n.method }}</h5> <div class="gl-display-flex"> - <pre class="bg-light gl-flex-fill-1" data-testid="runner-instructions"> + <pre + class="bg-light gl-flex-fill-1 gl-white-space-pre-line" + data-testid="runner-instructions" + > {{ instructions.registerInstructions }} </pre> <gl-button |