Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 7 insertions, 9 deletions

diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js
index 7922ff22a70..e9772232eaf 100644
--- a/app/assets/javascripts/lib/utils/url_utility.js
+++ b/app/assets/javascripts/lib/utils/url_utility.js
@@ -474,19 +474,17 @@ export function queryToObject(query, { gatherArrays = false, legacySpacesDecode
     }
 
     const decodedValue = legacySpacesDecode ? decodeURIComponent(value) : decodeUrlParameter(value);
+    const decodedKey = legacySpacesDecode ? decodeURIComponent(key) : decodeUrlParameter(key);
 
-    if (gatherArrays && key.endsWith('[]')) {
-      const decodedKey = legacySpacesDecode
-        ? decodeURIComponent(key.slice(0, -2))
-        : decodeUrlParameter(key.slice(0, -2));
+    if (gatherArrays && decodedKey.endsWith('[]')) {
+      const decodedArrayKey = decodedKey.slice(0, -2);
 
-      if (!Array.isArray(accumulator[decodedKey])) {
-        accumulator[decodedKey] = [];
+      if (!Array.isArray(accumulator[decodedArrayKey])) {
+        accumulator[decodedArrayKey] = [];
       }
-      accumulator[decodedKey].push(decodedValue);
-    } else {
-      const decodedKey = legacySpacesDecode ? decodeURIComponent(key) : decodeUrlParameter(key);
 
+      accumulator[decodedArrayKey].push(decodedValue);
+    } else {
       accumulator[decodedKey] = decodedValue;
     }