diff --git a/Gemfile b/Gemfile index f7f79ec8..bcc59aa3 100644 --- a/Gemfile +++ b/Gemfile @@ -123,7 +123,10 @@ end # as date picker gem 'bootstrap3-datetimepicker-rails', '~> 3.0.2' -gem 'jquery-datatables-rails', '~> 2.2.1' + +# data tables +gem 'ajax-datatables-rails' +gem 'jquery-datatables-rails' # for charts gem 'chart-js-rails' diff --git a/Gemfile.lock b/Gemfile.lock index b37b09d8..b1a90cb8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,6 +72,8 @@ GEM airbrake (7.1.1) airbrake-ruby (~> 2.5) airbrake-ruby (2.7.0) + ajax-datatables-rails (0.4.3) + railties (>= 4.0) arel (7.1.4) ast (2.4.0) autoprefixer-rails (7.1.1) @@ -232,8 +234,10 @@ GEM inversion (1.0.0) loggability (~> 0.12) iso-639 (0.2.5) - jquery-datatables-rails (2.2.3) + jquery-datatables-rails (3.4.0) + actionpack (>= 3.1) jquery-rails + railties (>= 3.1) sass-rails jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) @@ -578,6 +582,7 @@ DEPENDENCIES acts_as_list ahoy_matey airbrake (~> 7.1) + ajax-datatables-rails autoprefixer-rails awesome_nested_set (~> 3.1.3) axlsx! @@ -616,7 +621,7 @@ DEPENDENCIES haml-rails haml_lint (~> 0.24.0) iso-639 - jquery-datatables-rails (~> 2.2.1) + jquery-datatables-rails jquery-rails jquery-ui-rails (~> 4.2.1) json-schema