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:
authorPhil Hughes <me@iamphill.com>2018-06-06 10:43:15 +0300
committerPhil Hughes <me@iamphill.com>2018-06-06 10:43:15 +0300
commitec37b1b20c09d3a5b5a0e2cd0b03311ec95d7c68 (patch)
tree6882afab9817f1c0906e8492f2c839b9db9d05d3 /app/assets/javascripts
parentb992871856723a96246cb65510556602dda190cd (diff)
added empty state
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/ide/components/jobs/detail.vue6
-rw-r--r--app/assets/javascripts/ide/components/jobs/item.vue1
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/components/jobs/detail.vue b/app/assets/javascripts/ide/components/jobs/detail.vue
index b054bf36660..4d234a36fe5 100644
--- a/app/assets/javascripts/ide/components/jobs/detail.vue
+++ b/app/assets/javascripts/ide/components/jobs/detail.vue
@@ -1,6 +1,7 @@
<script>
import { mapActions, mapState } from 'vuex';
import _ from 'underscore';
+import { __ } from '../../../locale';
import tooltip from '../../../vue_shared/directives/tooltip';
import Icon from '../../../vue_shared/components/icon.vue';
import ScrollButton from './detail/scroll_button.vue';
@@ -33,6 +34,9 @@ export default {
isScrolledToTop() {
return this.scrollPos === scrollPositions.top;
},
+ jobOutput() {
+ return this.detailJob.output || __('No messages were logged');
+ },
},
mounted() {
this.getTrace();
@@ -119,7 +123,7 @@ export default {
>
<code
class="bash"
- v-html="detailJob.output"
+ v-html="jobOutput"
>
</code>
<div
diff --git a/app/assets/javascripts/ide/components/jobs/item.vue b/app/assets/javascripts/ide/components/jobs/item.vue
index 82881e2cc7f..c8e621504f0 100644
--- a/app/assets/javascripts/ide/components/jobs/item.vue
+++ b/app/assets/javascripts/ide/components/jobs/item.vue
@@ -32,6 +32,7 @@ export default {
/>
<div class="ml-auto align-self-center">
<button
+ v-if="job.started"
type="button"
class="btn btn-default btn-sm"
@click="clickViewLog"