diff --git a/ee/app/assets/javascripts/compliance_dashboard/components/merge_requests/branch_details.vue b/ee/app/assets/javascripts/compliance_dashboard/components/merge_requests/branch_details.vue new file mode 100644 index 0000000000000000000000000000000000000000..c7a42451def483145e8693bf5dce1dd83b8c04b4 --- /dev/null +++ b/ee/app/assets/javascripts/compliance_dashboard/components/merge_requests/branch_details.vue @@ -0,0 +1,74 @@ + + + diff --git a/ee/app/assets/javascripts/compliance_dashboard/components/merge_requests/grid.vue b/ee/app/assets/javascripts/compliance_dashboard/components/merge_requests/grid.vue index 98ebe3f92e5621df9b1bf3d17365294bf42fc476..86db63da90f99585f8c89b920250ccd2bc2cb47c 100644 --- a/ee/app/assets/javascripts/compliance_dashboard/components/merge_requests/grid.vue +++ b/ee/app/assets/javascripts/compliance_dashboard/components/merge_requests/grid.vue @@ -7,6 +7,7 @@ import timeagoMixin from '~/vue_shared/mixins/timeago'; import ApprovalStatus from './approval_status.vue'; import Approvers from './approvers.vue'; +import BranchDetails from './branch_details.vue'; import MergeRequest from './merge_request.vue'; import PipelineStatus from './pipeline_status.vue'; import GridColumnHeading from '../shared/grid_column_heading.vue'; @@ -19,6 +20,7 @@ export default { components: { ApprovalStatus, Approvers, + BranchDetails, GridColumnHeading, MergeRequest, PipelineStatus, @@ -51,6 +53,9 @@ export default { hasStatus(status) { return !isEmpty(status); }, + hasBranchDetails(mergeRequest) { + return mergeRequest.target_branch && mergeRequest.source_branch; + }, }, strings: { mergeRequestLabel: __('Merge Request'), @@ -105,6 +110,17 @@ export default { class="gl-text-right gl-border-b-solid gl-border-b-1 gl-border-b-gray-100 gl-p-5 gl-relative" > +