summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/dispatcher.js
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-08-16 12:31:47 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-08-16 12:31:47 +0000
commitee4528526e1bbf58f256c0fcc27873fcdf80daa4 (patch)
treeaf07e1f0d30477c6b1ed5dab5bf411b417db2d49 /app/assets/javascripts/dispatcher.js
parent1998a4a10796a277b3e587e61a8299ce981c92d2 (diff)
parent554afea059446384783f3c68c09ac56afa0e7d49 (diff)
downloadgitlab-ce-ee4528526e1bbf58f256c0fcc27873fcdf80daa4.tar.gz
Merge branch 'dispatcher-race-condition-fix' into 'master'
Fix race condition with dispatcher.js See merge request !13377
Diffstat (limited to 'app/assets/javascripts/dispatcher.js')
-rw-r--r--app/assets/javascripts/dispatcher.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index de47485c9f2..a0ed5c23ffe 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -644,7 +644,7 @@ import initChangesDropdown from './init_changes_dropdown';
return Dispatcher;
})();
- $(function() {
+ $(window).on('load', function() {
new Dispatcher();
});
}).call(window);