Add latest changes from gitlab-org/gitlab@master

3 files changed, 8 insertions, 7 deletions

diff --git a/spec/javascripts/ide/components/commit_sidebar/list_item_spec.js b/spec/javascripts/ide/components/commit_sidebar/list_item_spec.js
index caf06b5e1d8..63ba6b95619 100644
--- a/spec/javascripts/ide/components/commit_sidebar/list_item_spec.js
+++ b/spec/javascripts/ide/components/commit_sidebar/list_item_spec.js
@@ -20,7 +20,6 @@ describe('Multi-file editor commit sidebar list item', () => {
 
     vm = createComponentWithStore(Component, store, {
       file: f,
-      actionComponent: 'stage-button',
       activeFileKey: `staged-${f.key}`,
     }).$mount();
 
diff --git a/spec/javascripts/ide/components/commit_sidebar/list_spec.js b/spec/javascripts/ide/components/commit_sidebar/list_spec.js
index 81120f6d277..5a1682523d8 100644
--- a/spec/javascripts/ide/components/commit_sidebar/list_spec.js
+++ b/spec/javascripts/ide/components/commit_sidebar/list_spec.js
@@ -17,7 +17,6 @@ describe('Multi-file editor commit sidebar list', () => {
       action: 'stageAllChanges',
       actionBtnText: 'stage all',
       actionBtnIcon: 'history',
-      itemActionComponent: 'stage-button',
       activeFileKey: 'staged-testing',
       keyPrefix: 'staged',
     });
diff --git a/spec/javascripts/vue_shared/components/issue/related_issuable_mock_data.js b/spec/javascripts/vue_shared/components/issue/related_issuable_mock_data.js
index 26bfdd7551e..92080cb9bd5 100644
--- a/spec/javascripts/vue_shared/components/issue/related_issuable_mock_data.js
+++ b/spec/javascripts/vue_shared/components/issue/related_issuable_mock_data.js
@@ -6,40 +6,43 @@ export const defaultProps = {
 
 export const issuable1 = {
   id: 200,
-  epic_issue_id: 1,
+  epicIssueId: 1,
   confidential: false,
   reference: 'foo/bar#123',
   displayReference: '#123',
   title: 'some title',
   path: '/foo/bar/issues/123',
   state: 'opened',
+  linkType: 'relates_to',
 };
 
 export const issuable2 = {
   id: 201,
-  epic_issue_id: 2,
+  epicIssueId: 2,
   confidential: false,
   reference: 'foo/bar#124',
   displayReference: '#124',
   title: 'some other thing',
   path: '/foo/bar/issues/124',
   state: 'opened',
+  linkType: 'blocks',
 };
 
 export const issuable3 = {
   id: 202,
-  epic_issue_id: 3,
+  epicIssueId: 3,
   confidential: false,
   reference: 'foo/bar#125',
   displayReference: '#125',
   title: 'some other other thing',
   path: '/foo/bar/issues/125',
   state: 'opened',
+  linkType: 'is_blocked_by',
 };
 
 export const issuable4 = {
   id: 203,
-  epic_issue_id: 4,
+  epicIssueId: 4,
   confidential: false,
   reference: 'foo/bar#126',
   displayReference: '#126',
@@ -50,7 +53,7 @@ export const issuable4 = {
 
 export const issuable5 = {
   id: 204,
-  epic_issue_id: 5,
+  epicIssueId: 5,
   confidential: false,
   reference: 'foo/bar#127',
   displayReference: '#127',