Remove will_paginate in favor of kaminari; install jsonapi_suite gems…

…; bundle update to resolve conflicts.
legoabram · Mar 9, 2018 · 0a795b4 · 0a795b4
1 parent a3f421a
commit 0a795b4
Show file tree

Hide file tree

Showing 36 changed files with 284 additions and 267 deletions.
diff --git a/Gemfile b/Gemfile
@@ -16,11 +16,7 @@ gem 'devise', '~> 4.4'
 gem 'devise-bootstrap-views'
 gem 'pundit'
 gem 'alchemist'
-gem 'roo'
-gem 'roo-xls'
 gem 'carmen'
-gem 'will_paginate'
-gem 'bootstrap-will_paginate'
 gem 'api-pagination'
 gem 'twitter-bootstrap-rails'
 gem 'pg', '~> 0.20'
@@ -53,6 +49,11 @@ gem 'webpacker', '~> 3.0'
 gem 'gpx'
 gem 'activerecord-import'
 
+gem 'jsonapi_suite', '~> 0.7'
+gem 'jsonapi-rails', '~> 0.3.0'
+gem 'jsonapi_swagger_helpers', '~> 0.6', require: false
+gem 'jsonapi_spec_helpers', '~> 0.4', require: false
+gem 'kaminari', '~> 1.0'
 
 group :development do
   gem 'bullet'