summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-06-07 13:13:10 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-06-07 15:27:30 -0600
commitd9422aef859334de737341ed4acf1933439c5693 (patch)
tree6ee4e89a8ebcd9a2d3749b99a9c5f18fa7cb9aae
parent2cbb17da31be0d18e8457232255da0bd5ac87db5 (diff)
downloadgitlab-ce-d9422aef859334de737341ed4acf1933439c5693.tar.gz
Only load Chart.js when necessary.
-rw-r--r--app/assets/javascripts/application.js.coffee1
-rw-r--r--app/assets/javascripts/graphs/application.js.coffee1
2 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index ebf425550e9..2bb11b11d5d 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 .