summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-08-14 10:58:56 +0000
committerPhil Hughes <me@iamphill.com>2018-08-14 10:58:56 +0000
commitf271d9b0758850c74e560845a60129034010dfda (patch)
tree1cd989e6f3ce5fcccb6061a47b9ccaab855321a4 /app/assets/javascripts
parentb8b1c0e37a7f35bbbec73b74e73d125675831ca4 (diff)
parent32196a7fbed89171fa9be9bd937cd79bf9766ba7 (diff)
downloadgitlab-ce-f271d9b0758850c74e560845a60129034010dfda.tar.gz
Merge branch '50101-job-log-component' into 'master'
Creates a vue component for the job log trace output See merge request gitlab-org/gitlab-ce!21167
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/jobs/components/job_log.vue33
1 files changed, 33 insertions, 0 deletions
diff --git a/app/assets/javascripts/jobs/components/job_log.vue b/app/assets/javascripts/jobs/components/job_log.vue
new file mode 100644
index 00000000000..3c4749d996b
--- /dev/null
+++ b/app/assets/javascripts/jobs/components/job_log.vue
@@ -0,0 +1,33 @@
+<script>
+ export default {
+ name: 'JobLog',
+ props: {
+ trace: {
+ type: String,
+ required: true,
+ },
+ isReceivingBuildTrace: {
+ type: Boolean,
+ required: true,
+ },
+ },
+ };
+</script>
+<template>
+ <pre class="build-trace">
+ <code
+ class="bash"
+ v-html="trace"
+ >
+ </code>
+
+ <div
+ v-if="isReceivingBuildTrace"
+ class="js-log-animation build-loader-animation"
+ >
+ <div class="dot"></div>
+ <div class="dot"></div>
+ <div class="dot"></div>
+ </div>
+ </pre>
+</template>