Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 12 deletions

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index b6db43e128b..9fcf881a1ac 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -111,18 +111,21 @@ function deferredInitialisation() {
   initPersistentUserCallouts();
   initDefaultTrackers();
 
-  document.querySelector('#search').addEventListener(
-    'focus',
-    () => {
-      import(/* webpackChunkName: 'globalSearch' */ './search_autocomplete')
-        .then(({ default: initSearchAutocomplete }) => {
-          const searchDropdown = initSearchAutocomplete();
-          searchDropdown.onSearchInputFocus();
-        })
-        .catch(() => {});
-    },
-    { once: true },
-  );
+  const search = document.querySelector('#search');
+  if (search) {
+    search.addEventListener(
+      'focus',
+      () => {
+        import(/* webpackChunkName: 'globalSearch' */ './search_autocomplete')
+          .then(({ default: initSearchAutocomplete }) => {
+            const searchDropdown = initSearchAutocomplete();
+            searchDropdown.onSearchInputFocus();
+          })
+          .catch(() => {});
+      },
+      { once: true },
+    );
+  }
 
   addSelectOnFocusBehaviour('.js-select-on-focus');