Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 2 insertions, 11 deletions

diff --git a/app/assets/javascripts/diffs/utils/preferences.js b/app/assets/javascripts/diffs/utils/preferences.js
index e440de3350a..6b4aaf45937 100644
--- a/app/assets/javascripts/diffs/utils/preferences.js
+++ b/app/assets/javascripts/diffs/utils/preferences.js
@@ -1,22 +1,13 @@
 import Cookies from 'js-cookie';
-import { getParameterValues } from '~/lib/utils/url_utility';
-
 import { DIFF_FILE_BY_FILE_COOKIE_NAME, DIFF_VIEW_FILE_BY_FILE } from '../constants';
 
 export function fileByFile(pref = false) {
-  const search = getParameterValues(DIFF_FILE_BY_FILE_COOKIE_NAME)?.[0];
   const cookie = Cookies.get(DIFF_FILE_BY_FILE_COOKIE_NAME);
-  let viewFileByFile = pref;
 
   // use the cookie first, if it exists
   if (cookie) {
-    viewFileByFile = cookie === DIFF_VIEW_FILE_BY_FILE;
-  }
-
-  // the search parameter of the URL should override, if it exists
-  if (search) {
-    viewFileByFile = search === DIFF_VIEW_FILE_BY_FILE;
+    return cookie === DIFF_VIEW_FILE_BY_FILE;
   }
 
-  return viewFileByFile;
+  return pref;
 }