diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-03-07 15:16:46 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-07 15:16:46 +0700 |
| commit | 788839107e55b73ee00ac837ee23033592bf5927 (patch) | |
| tree | 4138f9058535a0cf79aec6a87c49b4afe6c6bf1d | |
| parent | a3e5762031f6a76eb74afc1be102a4dc3b68d996 (diff) | |
| download | gitlab-ce-mr-widget-pipeline-block-for-mr-pipelines.tar.gz | |
Extend merge request widget pipeline block for merge request pipelinesmr-widget-pipeline-block-for-mr-pipelines
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue | 22 |
1 files 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 }}</a > on - <tooltip-on-truncate - :title="sourceBranch" - truncate-target="child" - class="label-branch label-truncate" - v-html="sourceBranchLink" - /> + if pipeline.merge_request.exist? { + <a :href="pipeline.merge_request.path" class="blah" >{{ pipeline.merge_request.iid }}</a> + with + <a :href="pipeline.merge_request.source_branch_path" class="blah">{{ pipeline.merge_request.source_branch }}</a> + if pipeline.merge_request["flags"]["attached"] { + into + <a :href="pipeline.merge_request.target_branch_path" class="blah">{{ pipeline.merge_request.target_branch }}</a> + } + } else { + <tooltip-on-truncate + :title="sourceBranch" + truncate-target="child" + class="label-branch label-truncate" + v-html="sourceBranchLink" + /> + } </template> </div> <div v-if="pipeline.coverage" class="coverage">Coverage {{ pipeline.coverage }}%</div> |