diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-01-01 22:10:48 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-01 22:10:48 -0500 |
commit | 4caf0433b7a06427c82eb1b2830d2c2dd830f144 (patch) | |
tree | 1fb8b48b479a12eccc1e47d7f3f7579345c97314 /app/assets/javascripts/application.js.coffee | |
parent | f8c3b69fb675f33607315acfacb4fdac170a3635 (diff) | |
download | gitlab-ce-4caf0433b7a06427c82eb1b2830d2c2dd830f144.tar.gz |
Reorder JS requires
The old way broke d3, for some reason.
Diffstat (limited to 'app/assets/javascripts/application.js.coffee')
-rw-r--r-- | app/assets/javascripts/application.js.coffee | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index affab5bb030..e7e997640d5 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -16,6 +16,8 @@ #= require jquery.scrollTo #= require jquery.blockUI #= require jquery.turbolinks +#= require d3 +#= require cal-heatmap #= require turbolinks #= require autosave #= require bootstrap @@ -27,7 +29,6 @@ #= require branch-graph #= require ace/ace #= require ace/ext-searchbox -#= require d3 #= require underscore #= require nprogress #= require nprogress-turbolinks @@ -39,7 +40,6 @@ #= require shortcuts_dashboard_navigation #= require shortcuts_issuable #= require shortcuts_network -#= require cal-heatmap #= require jquery.nicescroll.min #= require_tree . |