gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to current datatables gems

Browse source 
* Update jquery-datable-rails
* Add ajax-datatables-rails
This commit is contained in:
James Mason 2018-04-06 11:36:24 -07:00 • committed by Henne Vogelsang
parent 9380173fbc
commit 9412faddfe
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Gemfile
View file

@ -123,7 +123,10 @@ end
# as date picker # as date picker
gem 'bootstrap3-datetimepicker-rails', '~> 3.0.2' 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 # for charts
gem 'chart-js-rails' gem 'chart-js-rails'

9
Gemfile.lock
View file

@ -72,6 +72,8 @@ GEM
airbrake (7.1.1) airbrake (7.1.1)
airbrake-ruby (~> 2.5) airbrake-ruby (~> 2.5)
airbrake-ruby (2.7.0) airbrake-ruby (2.7.0)
ajax-datatables-rails (0.4.3)
railties (>= 4.0)
arel (7.1.4) arel (7.1.4)
ast (2.4.0) ast (2.4.0)
autoprefixer-rails (7.1.1) autoprefixer-rails (7.1.1)
@ -232,8 +234,10 @@ GEM
inversion (1.0.0) inversion (1.0.0)
loggability (~> 0.12) loggability (~> 0.12)
iso-639 (0.2.5) iso-639 (0.2.5)
jquery-datatables-rails (2.2.3) jquery-datatables-rails (3.4.0)
actionpack (>= 3.1)
jquery-rails jquery-rails
railties (>= 3.1)
sass-rails sass-rails
jquery-rails (4.3.1) jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
@ -578,6 +582,7 @@ DEPENDENCIES
acts_as_list acts_as_list
ahoy_matey ahoy_matey
airbrake (~> 7.1) airbrake (~> 7.1)
ajax-datatables-rails
autoprefixer-rails autoprefixer-rails
awesome_nested_set (~> 3.1.3) awesome_nested_set (~> 3.1.3)
axlsx! axlsx!
@ -616,7 +621,7 @@ DEPENDENCIES
haml-rails haml-rails
haml_lint (~> 0.24.0) haml_lint (~> 0.24.0)
iso-639 iso-639
jquery-datatables-rails (~> 2.2.1) jquery-datatables-rails
jquery-rails jquery-rails
jquery-ui-rails (~> 4.2.1) jquery-ui-rails (~> 4.2.1)
json-schema json-schema