Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 31 deletions

diff --git a/app/assets/javascripts/lib/utils/axios_utils.js b/app/assets/javascripts/lib/utils/axios_utils.js
index a04fe609015..c17f62c671c 100644
--- a/app/assets/javascripts/lib/utils/axios_utils.js
+++ b/app/assets/javascripts/lib/utils/axios_utils.js
@@ -1,6 +1,5 @@
 import axios from 'axios';
 import csrf from './csrf';
-import suppressAjaxErrorsDuringNavigation from './suppress_ajax_errors_during_navigation';
 
 axios.defaults.headers.common[csrf.headerKey] = csrf.token;
 // Used by Rails to check if it is a valid XHR request
@@ -26,20 +25,6 @@ axios.interceptors.response.use(
   },
 );
 
-let isUserNavigating = false;
-window.addEventListener('beforeunload', () => {
-  isUserNavigating = true;
-});
-
-// Ignore AJAX errors caused by requests
-// being cancelled due to browser navigation
-const { gon } = window;
-const featureFlagEnabled = gon && gon.features && gon.features.suppressAjaxNavigationErrors;
-axios.interceptors.response.use(
-  response => response,
-  err => suppressAjaxErrorsDuringNavigation(err, isUserNavigating, featureFlagEnabled),
-);
-
 export default axios;
 
 /**
diff --git a/app/assets/javascripts/lib/utils/suppress_ajax_errors_during_navigation.js b/app/assets/javascripts/lib/utils/suppress_ajax_errors_during_navigation.js
deleted file mode 100644
index 4c61da9b862..00000000000
--- a/app/assets/javascripts/lib/utils/suppress_ajax_errors_during_navigation.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * An Axios error interceptor that suppresses AJAX errors caused
- * by the request being cancelled when the user navigates to a new page
- */
-export default (err, isUserNavigating, featureFlagEnabled) => {
-  if (featureFlagEnabled && isUserNavigating && err.code === 'ECONNABORTED') {
-    // If the user is navigating away from the current page,
-    // prevent .then() and .catch() handlers from being
-    // called by returning a Promise that never resolves
-    return new Promise(() => {});
-  }
-
-  // The error is not related to browser navigation,
-  // so propagate the error
-  return Promise.reject(err);
-};