Add latest changes from gitlab-org/gitlab@masterogolowinski-master-patch-80898

2 files changed, 7 insertions, 20 deletions

diff --git a/spec/frontend/fixtures/static/projects.json b/spec/frontend/fixtures/static/projects.json
index f28d9899099..d92d3acdea0 100644
--- a/spec/frontend/fixtures/static/projects.json
+++ b/spec/frontend/fixtures/static/projects.json
@@ -99,15 +99,6 @@
       "access_level": 50,
       "notification_level": 3
     }
-  },
-  "_links": {
-    "self": "https://gitlab.com/api/v4/projects/278964",
-    "issues": "https://gitlab.com/api/v4/projects/278964/issues",
-    "merge_requests": "https://gitlab.com/api/v4/projects/278964/merge_requests",
-    "repo_branches": "https://gitlab.com/api/v4/projects/278964/repository/branches",
-    "labels": "https://gitlab.com/api/v4/projects/278964/labels",
-    "events": "https://gitlab.com/api/v4/projects/278964/events",
-    "members": "https://gitlab.com/api/v4/projects/278964/members"
   }
 }, {
   "id": 7,
diff --git a/spec/frontend/lib/utils/suppress_ajax_errors_during_navigation_spec.js b/spec/frontend/lib/utils/suppress_ajax_errors_during_navigation_spec.js
index b9c1d65738d..da10e0e618d 100644
--- a/spec/frontend/lib/utils/suppress_ajax_errors_during_navigation_spec.js
+++ b/spec/frontend/lib/utils/suppress_ajax_errors_during_navigation_spec.js
@@ -6,24 +6,20 @@ describe('suppressAjaxErrorsDuringNavigation', () => {
   const NAV_ERR_CODE = 'ECONNABORTED';
 
   it.each`
-    isFeatureFlagEnabled | isUserNavigating | code
-    ${false}             | ${false}         | ${OTHER_ERR_CODE}
-    ${false}             | ${false}         | ${NAV_ERR_CODE}
-    ${false}             | ${true}          | ${OTHER_ERR_CODE}
-    ${false}             | ${true}          | ${NAV_ERR_CODE}
-    ${true}              | ${false}         | ${OTHER_ERR_CODE}
-    ${true}              | ${false}         | ${NAV_ERR_CODE}
-    ${true}              | ${true}          | ${OTHER_ERR_CODE}
-  `('should return a rejected Promise', ({ isFeatureFlagEnabled, isUserNavigating, code }) => {
+    isUserNavigating | code
+    ${false}         | ${OTHER_ERR_CODE}
+    ${false}         | ${NAV_ERR_CODE}
+    ${true}          | ${OTHER_ERR_CODE}
+  `('should return a rejected Promise', ({ isUserNavigating, code }) => {
     const err = { code };
-    const actual = suppressAjaxErrorsDuringNavigation(err, isUserNavigating, isFeatureFlagEnabled);
+    const actual = suppressAjaxErrorsDuringNavigation(err, isUserNavigating);
 
     return expect(actual).rejects.toBe(err);
   });
 
   it('should return a Promise that never resolves', () => {
     const err = { code: NAV_ERR_CODE };
-    const actual = suppressAjaxErrorsDuringNavigation(err, true, true);
+    const actual = suppressAjaxErrorsDuringNavigation(err, true);
 
     const thenCallback = jest.fn();
     const catchCallback = jest.fn();