Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 7 deletions

diff --git a/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js b/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js
index b672bc292bf..b6b3dbd5b6b 100644
--- a/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js
+++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js
@@ -7,7 +7,6 @@ const TEST_AVATAR = `${TEST_HOST}/avatar.png`;
 const TEST_DEFAULT_AVATAR_URL = `${TEST_HOST}/default/avatar/url.png`;
 
 describe('AssigneeAvatar', () => {
-  let origGon;
   let wrapper;
 
   function createComponent(props = {}) {
@@ -24,14 +23,9 @@ describe('AssigneeAvatar', () => {
   }
 
   beforeEach(() => {
-    origGon = window.gon;
     window.gon = { default_avatar_url: TEST_DEFAULT_AVATAR_URL };
   });
 
-  afterEach(() => {
-    window.gon = origGon;
-  });
-
   const findImg = () => wrapper.find('img');
 
   it('does not show warning icon if assignee can merge', () => {
diff --git a/spec/frontend/sidebar/components/assignees/sidebar_assignees_widget_spec.js b/spec/frontend/sidebar/components/assignees/sidebar_assignees_widget_spec.js
index bec6f9e26ab..9f7c587ca9d 100644
--- a/spec/frontend/sidebar/components/assignees/sidebar_assignees_widget_spec.js
+++ b/spec/frontend/sidebar/components/assignees/sidebar_assignees_widget_spec.js
@@ -99,7 +99,6 @@ describe('Sidebar assignees widget', () => {
 
   afterEach(() => {
     fakeApollo = null;
-    delete gon.current_username;
   });
 
   describe('with passed initial assignees', () => {