From 51a9c5492388a95ac82292333d068c6d1bab9d64 Mon Sep 17 00:00:00 2001
From: Martin Wortschack <mwortschack@gitlab.com>
Date: Mon, 21 Jan 2019 12:39:11 +0000
Subject: [PATCH] Resolve "Admin Settings: Cannot read property
 'addEventListener' of null"

---
 .../pages/admin/application_settings/show/index.js          | 3 +++
 app/assets/javascripts/pages/admin/index.js                 | 6 +-----
 ...ttings-cannot-read-property-addeventlistener-of-null.yml | 5 +++++
 spec/javascripts/test_bundle.js                             | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/pages/admin/application_settings/show/index.js
 create mode 100644 changelogs/unreleased/56622-admin-settings-cannot-read-property-addeventlistener-of-null.yml

diff --git a/app/assets/javascripts/pages/admin/application_settings/show/index.js b/app/assets/javascripts/pages/admin/application_settings/show/index.js
new file mode 100644
index 00000000000..5ec9688a6e4
--- /dev/null
+++ b/app/assets/javascripts/pages/admin/application_settings/show/index.js
@@ -0,0 +1,3 @@
+import initUserInternalRegexPlaceholder from '../../application_settings/account_and_limits';
+
+document.addEventListener('DOMContentLoaded', initUserInternalRegexPlaceholder());
diff --git a/app/assets/javascripts/pages/admin/index.js b/app/assets/javascripts/pages/admin/index.js
index 3aa793e47b9..8a32556f06c 100644
--- a/app/assets/javascripts/pages/admin/index.js
+++ b/app/assets/javascripts/pages/admin/index.js
@@ -1,7 +1,3 @@
 import initAdmin from './admin';
-import initUserInternalRegexPlaceholder from './application_settings/account_and_limits';
 
-document.addEventListener('DOMContentLoaded', () => {
-  initAdmin();
-  initUserInternalRegexPlaceholder();
-});
+document.addEventListener('DOMContentLoaded', initAdmin());
diff --git a/changelogs/unreleased/56622-admin-settings-cannot-read-property-addeventlistener-of-null.yml b/changelogs/unreleased/56622-admin-settings-cannot-read-property-addeventlistener-of-null.yml
new file mode 100644
index 00000000000..52b2db0e999
--- /dev/null
+++ b/changelogs/unreleased/56622-admin-settings-cannot-read-property-addeventlistener-of-null.yml
@@ -0,0 +1,5 @@
+---
+title: Load initUserInternalRegexPlaceholder only when required
+merge_request: 24522
+author:
+type: fixed
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js
index 96c0844f83c..547379dabed 100644
--- a/spec/javascripts/test_bundle.js
+++ b/spec/javascripts/test_bundle.js
@@ -187,6 +187,7 @@ if (process.env.BABEL_ENV === 'coverage') {
     './terminal/terminal_bundle.js',
     './users/users_bundle.js',
     './issue_show/index.js',
+    './pages/admin/application_settings/show/index.js',
   ];
 
   describe('Uncovered files', function() {