diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 23:51:10 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 23:51:10 +0300 |
| commit | 87c77718a483e372599562d3e5e10b000df74a30 (patch) | |
| tree | 46a1dccda27a3b285e37e611c821c086011adb1f /app/assets/javascripts | |
| parent | 2cb4cb2ee3bc2d34eb1c24f7643e7cfae84e4d17 (diff) | |
| parent | d9422aef859334de737341ed4acf1933439c5693 (diff) | |
Merge branch 'remove-chart' into 'master'
Only load Chart.js when necessary.
Only load Chart.js where it's used, namely the Graphs section. Follow up on !4394.
cc: @jschatz1
See merge request !4516
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/graphs/application.js.coffee | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 7526398dadc..7609236c13d 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -35,7 +35,6 @@ #= require raphael #= require g.raphael #= require g.bar -#= require Chart #= require branch-graph #= require ace/ace #= require ace/ext-searchbox diff --git a/app/assets/javascripts/graphs/application.js.coffee b/app/assets/javascripts/graphs/application.js.coffee index e0f681acf0b..91f81a5d249 100644 --- a/app/assets/javascripts/graphs/application.js.coffee +++ b/app/assets/javascripts/graphs/application.js.coffee @@ -4,4 +4,5 @@ # It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the # the compiled file. # +#= require Chart #= require_tree . |