Commit d56b76a5 authored by Phil Hughes's avatar Phil Hughes

Merge branch '56622-admin-settings-cannot-read-property-addeventlistener-of-null' into 'master'

Resolve "Admin Settings: Cannot read property 'addEventListener' of null"

Closes #56622

See merge request gitlab-org/gitlab-ce!24522
parents 466a7751 51a9c549
import initUserInternalRegexPlaceholder from '../../application_settings/account_and_limits';
document.addEventListener('DOMContentLoaded', initUserInternalRegexPlaceholder());
import initAdmin from './admin'; import initAdmin from './admin';
import initUserInternalRegexPlaceholder from './application_settings/account_and_limits';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', initAdmin());
initAdmin();
initUserInternalRegexPlaceholder();
});
---
title: Load initUserInternalRegexPlaceholder only when required
merge_request: 24522
author:
type: fixed
...@@ -187,6 +187,7 @@ if (process.env.BABEL_ENV === 'coverage') { ...@@ -187,6 +187,7 @@ if (process.env.BABEL_ENV === 'coverage') {
'./terminal/terminal_bundle.js', './terminal/terminal_bundle.js',
'./users/users_bundle.js', './users/users_bundle.js',
'./issue_show/index.js', './issue_show/index.js',
'./pages/admin/application_settings/show/index.js',
]; ];
describe('Uncovered files', function() { describe('Uncovered files', function() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment