From 788839107e55b73ee00ac837ee23033592bf5927 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Thu, 7 Mar 2019 15:16:46 +0700 Subject: Extend merge request widget pipeline block for merge request pipelines --- .../components/mr_widget_pipeline.vue | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 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 9e63aa00341..bb9e67f1562 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 @@ -113,12 +113,22 @@ export default { >{{ pipeline.commit.short_id }} on - + if pipeline.merge_request.exist? { + {{ pipeline.merge_request.iid }} + with + {{ pipeline.merge_request.source_branch }} + if pipeline.merge_request["flags"]["attached"] { + into + {{ pipeline.merge_request.target_branch }} + } + } else { + + }
Coverage {{ pipeline.coverage }}%
-- cgit v1.2.1