diff --git a/Gemfile b/Gemfile index 50f48727..355d051f 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ gem 'paperclip' # To use ActiveModel has_secure_password gem 'bcrypt', '~> 3.1.13' -gem 'chartjs-ror' +gem 'chartjs-ror', :github => 'ZeiP/chartjs-ror', :branch => 'bug/41_container_element' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks # gem 'turbolinks' diff --git a/Gemfile.lock b/Gemfile.lock index 74473b18..c106467e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: git://github.com/ZeiP/chartjs-ror.git + revision: e9d3aabbda3059c001144833d915a386d8b511c5 + branch: bug/41_container_element + specs: + chartjs-ror (3.6.4) + rails (>= 3.1) + GEM remote: https://rubygems.org/ specs: @@ -66,8 +74,6 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.0.1) - chartjs-ror (3.6.4) - rails (>= 3.1) childprocess (1.0.1) rake (< 13.0) climate_control (0.2.0) @@ -277,7 +283,7 @@ DEPENDENCIES bootstrap-sass (= 3.4.1) bullet byebug - chartjs-ror + chartjs-ror! codeclimate-test-reporter (= 1.0.7) coffee-rails (~> 4.2.0) database_cleaner diff --git a/app/views/stats/_actions.html.erb b/app/views/stats/_actions.html.erb index 1daf9b7f..2cdff002 100644 --- a/app/views/stats/_actions.html.erb +++ b/app/views/stats/_actions.html.erb @@ -3,8 +3,6 @@ options = { width: "400px", height: "400px", - maintainAspectRatio: false, - responsive: false, plugins: { colorschemes: { scheme: 'brewer.Paired12', diff --git a/app/views/stats/_contexts.html.erb b/app/views/stats/_contexts.html.erb index 54dfa730..7049afd8 100644 --- a/app/views/stats/_contexts.html.erb +++ b/app/views/stats/_contexts.html.erb @@ -15,8 +15,6 @@ Stats::TopContextsQuery.new(current_user).result.map { |context| options = { width: "400px", height: "400px", - maintainAspectRatio: false, - responsive: false, plugins: { colorschemes: { scheme: 'brewer.Paired12',