Commit 103c7a0b authored by Luke Bennett's avatar Luke Bennett

Resolve mr_widget_pipeline

parent 4c1988b5
...@@ -11,10 +11,7 @@ ...@@ -11,10 +11,7 @@
pipelineStage, pipelineStage,
ciIcon, ciIcon,
icon, icon,
<<<<<<< HEAD
linkedPipelinesMiniList, linkedPipelinesMiniList,
=======
>>>>>>> upstream/master
}, },
props: { props: {
pipeline: { pipeline: {
...@@ -101,7 +98,6 @@ ...@@ -101,7 +98,6 @@
{{ pipeline.commit.short_id }}</a>. {{ pipeline.commit.short_id }}</a>.
<span class="mr-widget-pipeline-graph"> <span class="mr-widget-pipeline-graph">
<<<<<<< HEAD
<span class="stage-cell"> <span class="stage-cell">
<linked-pipelines-mini-list <linked-pipelines-mini-list
v-if="triggeredBy.length" v-if="triggeredBy.length"
...@@ -124,19 +120,6 @@ ...@@ -124,19 +120,6 @@
v-if="triggered.length" v-if="triggered.length"
:triggered="triggered" :triggered="triggered"
/> />
=======
<span
class="stage-cell"
v-if="hasStages"
>
<div
v-for="(stage, i) in pipeline.details.stages"
:key="i"
class="stage-container dropdown js-mini-pipeline-graph"
>
<pipeline-stage :stage="stage" />
</div>
>>>>>>> upstream/master
</span> </span>
</span> </span>
......
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