Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-28 12:06:32 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-28 12:06:32 +0300
commit79348faced5e7e62103ad27f6a6594dfdca463e2 (patch)
tree385756f26c6d0b57c0c9e841b83784ff86634d5b /app/assets/javascripts/jobs
parent45a05a8ba33101ffcd154ee84307885b48b17962 (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/log.vue7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/jobs/components/log/log.vue b/app/assets/javascripts/jobs/components/log/log.vue
index 03a697d11ed..eb0de53f36a 100644
--- a/app/assets/javascripts/jobs/components/log/log.vue
+++ b/app/assets/javascripts/jobs/components/log/log.vue
@@ -9,7 +9,12 @@ export default {
LogLine,
},
computed: {
- ...mapState(['traceEndpoint', 'trace', 'isTraceComplete']),
+ ...mapState([
+ 'traceEndpoint',
+ 'trace',
+ 'isTraceComplete',
+ 'isScrolledToBottomBeforeReceivingTrace',
+ ]),
},
updated() {
this.$nextTick(() => {