mirror of
https://github.com/TracksApp/tracks.git
synced 2025-09-22 05:50:47 +02:00
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:
commit
09a380a475
5 changed files with 10 additions and 9 deletions
2
.github/workflows/continuous-integration.yml
vendored
2
.github/workflows/continuous-integration.yml
vendored
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
name: Continuous Integration
|
||||
|
||||
on: [push, pull_request]
|
||||
on: pull_request
|
||||
|
||||
jobs:
|
||||
test:
|
||||
|
|
2
Gemfile
2
Gemfile
|
@ -38,7 +38,7 @@ gem 'paperclip'
|
|||
# To use ActiveModel has_secure_password
|
||||
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
|
||||
# gem 'turbolinks'
|
||||
|
|
11
Gemfile.lock
11
Gemfile.lock
|
@ -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
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
|
@ -66,8 +73,6 @@ GEM
|
|||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (~> 1.11)
|
||||
byebug (11.0.1)
|
||||
chartjs-ror (3.6.4)
|
||||
rails (>= 3.1)
|
||||
childprocess (2.0.0)
|
||||
rake (< 13.0)
|
||||
climate_control (0.2.0)
|
||||
|
@ -277,7 +282,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
|
||||
|
|
|
@ -3,8 +3,6 @@
|
|||
options = {
|
||||
width: "400px",
|
||||
height: "400px",
|
||||
maintainAspectRatio: false,
|
||||
responsive: false,
|
||||
plugins: {
|
||||
colorschemes: {
|
||||
scheme: 'brewer.Paired12',
|
||||
|
|
|
@ -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',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue