summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-04-17 14:20:36 +0100
committerSteve Azzopardi <sazzopardi@gitlab.com>2019-05-07 16:39:02 +0200
commit61cb27b01daa1ba7016d8dc4bf5f0e3472756bc5 (patch)
treea4bdb0e814efcf817e8fb49fa3c1cd51f81a902d /app/assets
parent224c1462ded09432f5ab055c79119e8f4a5f3856 (diff)
downloadgitlab-ce-61cb27b01daa1ba7016d8dc4bf5f0e3472756bc5.tar.gz
Fixes empty block in MR widget
This commit prevents the pipeline block to be rendered when no pipeline information is provided
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
index f5a1ff2f6fd..f5fa68308bc 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
@@ -94,8 +94,8 @@ export default {
</script>
<template>
- <div v-if="hasPipeline || hasCIError" class="ci-widget media js-ci-widget">
- <template v-if="hasCIError">
+ <div class="ci-widget media js-ci-widget">
+ <template v-if="!hasPipeline || hasCIError">
<div
class="add-border ci-status-icon ci-status-icon-failed ci-error js-ci-error append-right-default"
>