Merge pull request #2260 from ZeiP/bug/#2259_charts_quality

#2259: Use a Chartjs-ror version with airblade/chartjs-ror#57 applied…
This commit is contained in:
Matt Rogers 2019-11-13 15:59:19 -06:00 committed by GitHub
commit 09a380a475
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 9 deletions

View file

@ -1,7 +1,7 @@
--- ---
name: Continuous Integration name: Continuous Integration
on: [push, pull_request] on: pull_request
jobs: jobs:
test: test:

View file

@ -38,7 +38,7 @@ gem 'paperclip'
# To use ActiveModel has_secure_password # To use ActiveModel has_secure_password
gem 'bcrypt', '~> 3.1.13' gem 'bcrypt', '~> 3.1.13'
gem 'chartjs-ror' gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
# gem 'turbolinks' # gem 'turbolinks'

View file

@ -1,3 +1,10 @@
GIT
remote: git://github.com/ZeiP/chartjs-ror.git
revision: e9d3aabbda3059c001144833d915a386d8b511c5
specs:
chartjs-ror (3.6.4)
rails (>= 3.1)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
@ -66,8 +73,6 @@ GEM
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
uniform_notifier (~> 1.11) uniform_notifier (~> 1.11)
byebug (11.0.1) byebug (11.0.1)
chartjs-ror (3.6.4)
rails (>= 3.1)
childprocess (2.0.0) childprocess (2.0.0)
rake (< 13.0) rake (< 13.0)
climate_control (0.2.0) climate_control (0.2.0)
@ -277,7 +282,7 @@ DEPENDENCIES
bootstrap-sass (= 3.4.1) bootstrap-sass (= 3.4.1)
bullet bullet
byebug byebug
chartjs-ror chartjs-ror!
codeclimate-test-reporter (= 1.0.7) codeclimate-test-reporter (= 1.0.7)
coffee-rails (~> 4.2.0) coffee-rails (~> 4.2.0)
database_cleaner database_cleaner

View file

@ -3,8 +3,6 @@
options = { options = {
width: "400px", width: "400px",
height: "400px", height: "400px",
maintainAspectRatio: false,
responsive: false,
plugins: { plugins: {
colorschemes: { colorschemes: {
scheme: 'brewer.Paired12', scheme: 'brewer.Paired12',

View file

@ -15,8 +15,6 @@ Stats::TopContextsQuery.new(current_user).result.map { |context|
options = { options = {
width: "400px", width: "400px",
height: "400px", height: "400px",
maintainAspectRatio: false,
responsive: false,
plugins: { plugins: {
colorschemes: { colorschemes: {
scheme: 'brewer.Paired12', scheme: 'brewer.Paired12',