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:
authorNathan Friend <nathan@gitlab.com>2019-06-17 17:16:15 +0300
committerNathan Friend <nathan@gitlab.com>2019-06-17 17:19:39 +0300
commitfd1dc9726cdaa5f5105f06219bf2d2f19a77e4c0 (patch)
treedee70c94ed4e47a6f89d76ed33d96ff4c1ef6440 /app/assets/javascripts
parentac01310fddc4d3d52c575e15b1e7589e02186312 (diff)
Add merge train position message (CE)
This commit adds an informational message under the pipeline block in the merge request widget that displays the current position of the merge request on the merge train.
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue11
1 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue
index 03a15ba81ed..ba9a4d2a187 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue
@@ -1,4 +1,5 @@
<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>