Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 5 deletions

diff --git a/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js b/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js
index 03bb88d1486..663d0af4cc4 100644
--- a/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js
+++ b/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js
@@ -27,7 +27,6 @@ describe('User Avatar Image Component', () => {
         propsData: {
           ...DEFAULT_PROPS,
         },
-        sync: false,
       });
     });
 
@@ -54,7 +53,6 @@ describe('User Avatar Image Component', () => {
           ...DEFAULT_PROPS,
           lazy: true,
         },
-        sync: false,
       });
     });
 
@@ -69,7 +67,7 @@ describe('User Avatar Image Component', () => {
 
   describe('Initialization without src', () => {
     beforeEach(() => {
-      wrapper = shallowMount(UserAvatarImage, { sync: false });
+      wrapper = shallowMount(UserAvatarImage);
     });
 
     it('should have default avatar image', () => {
@@ -86,7 +84,10 @@ describe('User Avatar Image Component', () => {
     };
 
     beforeEach(() => {
-      wrapper = shallowMount(UserAvatarImage, { propsData: { props }, slots, sync: false });
+      wrapper = shallowMount(UserAvatarImage, {
+        propsData: { props },
+        slots,
+      });
     });
 
     it('renders the tooltip slot', () => {
diff --git a/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js b/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js
index 16993cc21c9..2bbbab17bce 100644
--- a/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js
+++ b/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js
@@ -26,7 +26,6 @@ describe('User Avatar Link Component', () => {
         ...defaultProps,
         ...props,
       },
-      sync: false,
       attachToDocument: true,
     });
   };