gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update chart-js-rails to version 0.1.6

Browse source 
Supercedes #2152 with required code changes.
This commit is contained in:
James Mason 2018-10-10 09:48:38 -07:00 • committed by Henne Vogelsang
parent aa1c8e6c66
commit f3757fd4e7
7 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -113,7 +113,7 @@ GEM
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
carrierwave carrierwave
fastimage fastimage
chart-js-rails (0.0.6) chart-js-rails (0.1.6)
railties (> 3.1) railties (> 3.1)
chartkick (3.0.1) chartkick (3.0.1)
chronic (0.10.2) chronic (0.10.2)

2
app/views/admin/conferences/index.html.haml
View file

@ -1,4 +1,4 @@
= javascript_include_tag 'Chart' = javascript_include_tag 'Chart.min'
.row .row
.col-sm-3.col-xs-3 .col-sm-3.col-xs-3
= render "shared/big_statistic", = render "shared/big_statistic",

2
app/views/admin/conferences/show.html.haml
View file

@ -1,4 +1,4 @@
= javascript_include_tag 'Chart' = javascript_include_tag 'Chart.min'
%h1 %h1
%span.fa.fa-tachometer %span.fa.fa-tachometer

2
app/views/admin/events/index.html.haml
View file

@ -1,4 +1,4 @@
= javascript_include_tag 'Chart' = javascript_include_tag 'Chart.min'
.row .row
.col-md-12 .col-md-12

2
app/views/admin/physical_tickets/index.html.haml
View file

@ -1,4 +1,4 @@
= javascript_include_tag 'Chart' = javascript_include_tag 'Chart.min'
.container .container
.row .row

2
app/views/admin/registrations/index.html.haml
View file

@ -1,4 +1,4 @@
= javascript_include_tag 'Chart' = javascript_include_tag 'Chart.min'
.row .row
.col-md-12 .col-md-12

2
config/initializers/assets.rb
View file

@ -9,4 +9,4 @@ Rails.application.config.assets.version = '1.0'
# Precompile additional assets. # Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. # 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( search.js )
Rails.application.config.assets.precompile += %w( Chart.js ) Rails.application.config.assets.precompile += %w( Chart.min.js )