Commit 13dc38cd authored by Filipa Lacerda's avatar Filipa Lacerda

Fix conflicts for ...

Fix conflicts for  app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
parent 8a7f769e
No related merge requests found
...@@ -139,17 +139,31 @@ export default { ...@@ -139,17 +139,31 @@ export default {
<div> <div>
<span class="mr-widget-pipeline-graph"> <span class="mr-widget-pipeline-graph">
<span <span
v-if="hasStages"
class="stage-cell" class="stage-cell"
> >
<div <linked-pipelines-mini-list
v-for="(stage, i) in pipeline.details.stages" v-if="triggeredBy.length"
:key="i" :triggered-by="triggeredBy"
class="stage-container dropdown js-mini-pipeline-graph mr-widget-pipeline-stages" />
> <template v-if="hasStages">
<pipeline-stage :stage="stage" /> <div
</div> v-for="(stage, i) in pipeline.details.stages"
:key="i"
:class="{
'has-downstream': i === pipeline.details.stages.length - 1 && triggered.length
}"
class="stage-container dropdown js-mini-pipeline-graph
mr-widget-pipeline-stages"
>
<pipeline-stage :stage="stage" />
</div>
</template>
</span> </span>
<linked-pipelines-mini-list
v-if="triggered.length"
:triggered="triggered"
/>
</span> </span>
</div> </div>
</div> </div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment