Commit 982d62a0 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'ce-11981-show-merge-train-position' into 'master'

CE backport for gitlab-org/gitlab-ee!14064: Add merge train position indicator

See merge request gitlab-org/gitlab-ce!29561
parents 08ed6b17 fd1dc972
<script>
import _ from 'underscore';
import Deployment from './deployment.vue';
import MrWidgetContainer from './mr_widget_container.vue';
import MrWidgetPipeline from './mr_widget_pipeline.vue';
......@@ -17,6 +18,8 @@ export default {
Deployment,
MrWidgetContainer,
MrWidgetPipeline,
MergeTrainInfo: () =>
import('ee_component/vue_merge_request_widget/components/merge_train_info.vue'),
},
props: {
mr: {
......@@ -58,6 +61,9 @@ export default {
showVisualReviewAppLink() {
return Boolean(this.mr.visualReviewFF && this.mr.visualReviewAppAvailable);
},
showMergeTrainInfo() {
return _.isNumber(this.mr.mergeTrainIndex);
},
},
};
</script>
......@@ -83,6 +89,11 @@ export default {
:visual-review-app-meta="visualReviewAppMeta"
/>
</div>
<merge-train-info
v-if="showMergeTrainInfo"
class="mr-widget-extension"
:merge-train-index="mr.mergeTrainIndex"
/>
</template>
</mr-widget-container>
</template>
......@@ -904,7 +904,8 @@
margin-right: -5px;
}
.deploy-heading {
.deploy-heading,
.merge-train-info {
@include media-breakpoint-up(md) {
padding: $gl-padding-8 $gl-padding;
}
......
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