Skip to content

#2259: Use a Chartjs-ror version with airblade/chartjs-ror#57 applied… #2260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattr- merged 5 commits into from
Nov 13, 2019
Merged

#2259: Use a Chartjs-ror version with airblade/chartjs-ror#57 applied… #2260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e92b22e
#2259: Use a Chartjs-ror version with airblade/chartjs-ror#57 applied…
ZeiP Jun 27, 2019
f7bad05
Merge remote-tracking branch 'origin/master' into bug/#2259_charts_qu…
ZeiP Nov 13, 2019
7f45f74
#2259: Trying without the branch
ZeiP Nov 13, 2019
bc74047
#2259: Perhaps just run the CI once
ZeiP Nov 13, 2019
2d4a362
#2259: Try without the type limits for CI
ZeiP Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Continuous Integration

on: [push, pull_request]
on: pull_request

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
11 changes: 8 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions app/views/stats/_actions.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
options = {
width: "400px",
height: "400px",
maintainAspectRatio: false,
responsive: false,
plugins: {
colorschemes: {
scheme: 'brewer.Paired12',
Expand Down
2 changes: 0 additions & 2 deletions app/views/stats/_contexts.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down