diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-06-30 23:55:09 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-06-30 23:55:09 +0300 |
| commit | e48f54b5b23b4b865a4462151d576d2ff09d543e (patch) | |
| tree | ff73231294c1ac2c6793fc9a46f3e93c88cd9734 /app/assets/javascripts/main.js | |
| parent | 30c7fef03955bb4d2627b1de419be672c97a6df6 (diff) | |
| parent | 598baa554c29c7f69191b4ea46a049c558c3dbe5 (diff) | |
Merge branch 'enable-webpack-code-splitting' into 'master'
Enable webpack code splitting
Closes #32989
See merge request !12032
Diffstat (limited to 'app/assets/javascripts/main.js')
| -rw-r--r-- | app/assets/javascripts/main.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index de1b658f602..fe752d95b90 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -70,7 +70,7 @@ import './ajax_loading_spinner'; import './api'; import './aside'; import './autosave'; -import AwardsHandler from './awards_handler'; +import loadAwardsHandler from './awards_handler'; import './breakpoints'; import './broadcast_message'; import './build'; @@ -355,7 +355,7 @@ $(function () { $window.off('resize.app').on('resize.app', function () { return fitSidebarForSize(); }); - gl.awardsHandler = new AwardsHandler(); + loadAwardsHandler(); new Aside(); gl.utils.renderTimeago(); |