From f3757fd4e7a4fb85c762c582d15c3154a0b99541 Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Wed, 10 Oct 2018 09:48:38 -0700
Subject: [PATCH] Update chart-js-rails to version 0.1.6

Supercedes #2152 with required code changes.
---
 Gemfile.lock                                     | 2 +-
 app/views/admin/conferences/index.html.haml      | 2 +-
 app/views/admin/conferences/show.html.haml       | 2 +-
 app/views/admin/events/index.html.haml           | 2 +-
 app/views/admin/physical_tickets/index.html.haml | 2 +-
 app/views/admin/registrations/index.html.haml    | 2 +-
 config/initializers/assets.rb                    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 585d40bc..419b5e5d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,7 +113,7 @@ GEM
       activesupport (>= 3.2.0)
       carrierwave
       fastimage
-    chart-js-rails (0.0.6)
+    chart-js-rails (0.1.6)
       railties (> 3.1)
     chartkick (3.0.1)
     chronic (0.10.2)
diff --git a/app/views/admin/conferences/index.html.haml b/app/views/admin/conferences/index.html.haml
index 709a3f57..72d6179d 100644
--- a/app/views/admin/conferences/index.html.haml
+++ b/app/views/admin/conferences/index.html.haml
@@ -1,4 +1,4 @@
-= javascript_include_tag 'Chart'
+= javascript_include_tag 'Chart.min'
 .row
   .col-sm-3.col-xs-3
     = render "shared/big_statistic",
diff --git a/app/views/admin/conferences/show.html.haml b/app/views/admin/conferences/show.html.haml
index c681454a..5f70ee6b 100644
--- a/app/views/admin/conferences/show.html.haml
+++ b/app/views/admin/conferences/show.html.haml
@@ -1,4 +1,4 @@
-= javascript_include_tag 'Chart'
+= javascript_include_tag 'Chart.min'
 
 %h1
   %span.fa.fa-tachometer
diff --git a/app/views/admin/events/index.html.haml b/app/views/admin/events/index.html.haml
index 835880b7..d547c66b 100644
--- a/app/views/admin/events/index.html.haml
+++ b/app/views/admin/events/index.html.haml
@@ -1,4 +1,4 @@
-= javascript_include_tag 'Chart'
+= javascript_include_tag 'Chart.min'
 
 .row
   .col-md-12
diff --git a/app/views/admin/physical_tickets/index.html.haml b/app/views/admin/physical_tickets/index.html.haml
index cdc372fe..88303a50 100644
--- a/app/views/admin/physical_tickets/index.html.haml
+++ b/app/views/admin/physical_tickets/index.html.haml
@@ -1,4 +1,4 @@
-= javascript_include_tag 'Chart'
+= javascript_include_tag 'Chart.min'
 
 .container
   .row
diff --git a/app/views/admin/registrations/index.html.haml b/app/views/admin/registrations/index.html.haml
index f82c660c..0417dc68 100644
--- a/app/views/admin/registrations/index.html.haml
+++ b/app/views/admin/registrations/index.html.haml
@@ -1,4 +1,4 @@
-= javascript_include_tag 'Chart'
+= javascript_include_tag 'Chart.min'
 
 .row
   .col-md-12
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index ea148d49..1d25cea1 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -9,4 +9,4 @@ Rails.application.config.assets.version = '1.0'
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
-Rails.application.config.assets.precompile += %w( Chart.js )
+Rails.application.config.assets.precompile += %w( Chart.min.js )