Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 3 deletions

diff --git a/app/assets/javascripts/behaviors/autosize.js b/app/assets/javascripts/behaviors/autosize.js
index add43b81f6d..d61797b7ae4 100644
--- a/app/assets/javascripts/behaviors/autosize.js
+++ b/app/assets/javascripts/behaviors/autosize.js
@@ -1,8 +1,13 @@
 import Autosize from 'autosize';
+import { waitForCSSLoaded } from '../helpers/startup_css_helper';
 
 document.addEventListener('DOMContentLoaded', () => {
-  const autosizeEls = document.querySelectorAll('.js-autosize');
+  waitForCSSLoaded(() => {
+    const autosizeEls = document.querySelectorAll('.js-autosize');
 
-  Autosize(autosizeEls);
-  Autosize.update(autosizeEls);
+    Autosize(autosizeEls);
+    Autosize.update(autosizeEls);
+
+    autosizeEls.forEach(el => el.classList.add('js-autosize-initialized'));
+  });
 });