Commit 20ac0681 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'fix-mr-widget-vue-warnings-in-ee' into 'master'

Fix Vue warnings in the MR Widget (EE)

See merge request !2192
parents 110a308f a2fc8ea9
...@@ -20,6 +20,8 @@ import ApprovalsBody from '~/vue_merge_request_widget/ee/components/approvals/ap ...@@ -20,6 +20,8 @@ import ApprovalsBody from '~/vue_merge_request_widget/ee/components/approvals/ap
`); `);
this.initialData = { this.initialData = {
mr: {},
service: {},
suggestedApprovers: [{ name: 'Approver 1' }], suggestedApprovers: [{ name: 'Approver 1' }],
userCanApprove: false, userCanApprove: false,
userHasApproved: true, userHasApproved: true,
......
...@@ -28,6 +28,7 @@ describe('stage column component', () => { ...@@ -28,6 +28,7 @@ describe('stage column component', () => {
propsData: { propsData: {
title: 'foo', title: 'foo',
jobs: [mockJob, mockJob, mockJob], jobs: [mockJob, mockJob, mockJob],
hasTriggeredBy: false,
}, },
}).$mount(); }).$mount();
}); });
......
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