diff --git a/Gemfile b/Gemfile
index ac92bf18..6ef10620 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,13 +19,13 @@ gem 'uglifier', '>=1.3.0'
 gem 'aasm', '~> 5.2.0'
 gem 'acts_as_list'
 gem 'bcrypt', '~> 3.1.16'
-gem 'chartjs-ror', :git => 'git://github.com/ZeiP/chartjs-ror.git'
 gem 'htmlentities'
 gem 'paperclip'
 gem 'puma', '~> 5.4'
 gem 'rails_autolink'
 gem 'RedCloth'
 gem 'sanitize', '~> 6.0'
+gem 'tracks-chartjs-ror'
 gem 'will_paginate'
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
diff --git a/Gemfile.lock b/Gemfile.lock
index 1d4a973f..9376ebab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-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:
@@ -305,6 +298,8 @@ GEM
       rails (>= 5.0)
       safe_yaml (>= 0.8.6)
       sassc
+    tracks-chartjs-ror (3.6.4)
+      rails (>= 3.1)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
@@ -331,7 +326,6 @@ DEPENDENCIES
   bootstrap-sass (= 3.4.1)
   bullet
   byebug
-  chartjs-ror!
   codeclimate-test-reporter (= 1.0.7)
   coffee-rails (~> 5.0.0)
   database_cleaner
@@ -363,9 +357,10 @@ DEPENDENCIES
   sqlite3
   therubyracer
   tolk (~> 4.1.0)
+  tracks-chartjs-ror
   uglifier (>= 1.3.0)
   will_paginate
   yard
 
 BUNDLED WITH
-   2.1.4
+   2.2.22
diff --git a/test/integration/project_xml_api_test.rb b/test/integration/project_xml_api_test.rb
index f6dd305a..1412b864 100644
--- a/test/integration/project_xml_api_test.rb
+++ b/test/integration/project_xml_api_test.rb
@@ -3,7 +3,7 @@ require 'test_helper'
 class ProjectXmlApiTest < ActionDispatch::IntegrationTest
   @@project_name = "My New Project"
   @@valid_postdata = "<project><name>#{@@project_name}</name></project>"
-  
+
   def test_retrieve_project
     authenticated_get_xml "/projects/1.xml", users(:admin_user).login, 'abracadabra', {}
     assert_select 'project' do
@@ -20,37 +20,37 @@ class ProjectXmlApiTest < ActionDispatch::IntegrationTest
    # authenticated_post_xml_to_project_create "<foo></bar>"
    # assert_equal 500, @integration_session.status
  end
-    
+
   def test_fails_with_invalid_xml_format2
     authenticated_post_xml_to_project_create "<project><name></name></project>"
     assert_responses_with_error 'Name project must have a name'
   end
-  
+
   def test_xml_simple_param_parsing
     authenticated_post_xml_to_project_create
     assert @controller.params.has_key?(:project)
     assert @controller.params[:project].has_key?(:name)
     assert_equal @@project_name, @controller.params[:project][:name]
   end
-  
+
   def test_fails_with_401_if_not_authorized_user
     authenticated_post_xml_to_project_create @@valid_postdata, 'nobody', 'nohow'
     assert_response 401
   end
-  
+
   def test_fails_with_too_long_name
     invalid_with_long_name_postdata = "<project><name>foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoo arfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoo arfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfo barfoobarfoobarfoobarfoobarfoobarfoobar</name></project>"
     authenticated_post_xml_to_project_create invalid_with_long_name_postdata
     assert_responses_with_error 'Name context name must be less than 256 characters'
   end
-  
+
   def test_fails_with_comma_in_name
     authenticated_post_xml_to_project_create "<project><name>foo,bar</name></project>"
     assert_response :created
     project1 = Project.where(:name => "foo,bar").first
     assert_not_nil project1, "expected project 'foo,bar' to be created"
   end
-    
+
   def test_creates_new_project
     assert_difference 'Project.count' do
       authenticated_post_xml_to_project_create
@@ -59,9 +59,9 @@ class ProjectXmlApiTest < ActionDispatch::IntegrationTest
     project1 = Project.where(:name => @@project_name).first
     assert_not_nil project1, "expected project '#{@@project_name}' to be created"
   end
-      
+
   private
-    
+
   def authenticated_post_xml_to_project_create(postdata = @@valid_postdata, user = users(:other_user).login, password = 'sesame')
     authenticated_post_xml "/projects.xml", user, password, postdata
   end
@@ -69,5 +69,5 @@ class ProjectXmlApiTest < ActionDispatch::IntegrationTest
   def assert_404_invalid_xml
     assert_response_and_body 404, "Expected post format is valid xml like so: <project><name>project name</name></project>."
   end
-  
+
 end