Merge pull request #1662 from bgeuken/jquery_datatables

[webui] Update jquery-datatables-rails gem
openSUSE · Mar 30, 2016 · 95f240f · 95f240f
2 parents cfd2a1f + d6a2adb
commit 95f240f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/api/Gemfile b/src/api/Gemfile
@@ -136,7 +136,7 @@ group :assets do
   # to use sass in the asset pipeline
   gem 'sass-rails', '~> 5.0.1'
   # assets for jQuery DataTables
-  gem 'jquery-datatables-rails', '~> 1.12.2'  # version 3 needs henne's new webui
+  gem 'jquery-datatables-rails'
   # assets for the text editor
   gem 'codemirror-rails'
   # assets for jQuery tokeninput

diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock
@@ -360,7 +360,7 @@ DEPENDENCIES
   font-awesome-rails
   haml
   hoptoad_notifier (~> 2.3)
-  jquery-datatables-rails (~> 1.12.2)
+  jquery-datatables-rails
   jquery-rails
   jquery-ui-rails (~> 4.2.1)
   jquery_mobile_rails