diff --git a/Gemfile b/Gemfile index 1b6f1b60..7009a518 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,6 @@ end gem 'bootstrap3-datetimepicker-rails', '~> 3.0.2' gem 'jquery-datatables-rails', '~> 2.2.1' # for charts -gem 'd3_rails' gem 'chart-js-rails' # for user avatars diff --git a/Gemfile.lock b/Gemfile.lock index ef40e3bf..5dd6fdd0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -131,8 +131,6 @@ GEM term-ansicolor thor currencies (0.4.2) - d3_rails (3.4.6) - railties (>= 3.1.0) daemons (1.1.9) database_cleaner (1.3.0) debug_inspector (0.0.2) @@ -496,7 +494,6 @@ DEPENDENCIES cocoon country_select! coveralls - d3_rails daemons database_cleaner delayed_job_active_record diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 7cac4c52..98c9fbb1 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -18,7 +18,6 @@ //= require cocoon //= require bootstrap //= require Chart -//= require d3 //= require osem //= require osem-dashboard //= require ahoy