diff --git a/Gemfile b/Gemfile index 121a244..97563cb 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rack-cors', "~> 0.4" gem 'active_model_serializers', "~> 0.10" gem 'json-schema', "~> 2.8" gem 'json-schema_builder', "~> 0.0" -gem 'kaminari', "~> 1.0" +gem 'kaminari', "~> 1.2" gem 'jwt', "~> 1.5" gem 'pundit', "~> 1.1" gem 'rollbar', "~> 2.15" diff --git a/Gemfile.lock b/Gemfile.lock index 3176e28..c0c62d6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,18 +46,18 @@ GEM addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) arel (8.0.0) - builder (3.2.3) + builder (3.2.4) byebug (9.0.6) case_transform (0.2) activesupport coderay (1.1.1) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.7) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) + crass (1.0.6) database_cleaner (1.6.1) diff-lcs (1.3) - erubi (1.6.0) + erubi (1.9.0) factory_girl (4.8.0) activesupport (>= 3.0.0) factory_girl_rails (4.8.0) @@ -75,7 +75,8 @@ GEM globalid (0.4.0) activesupport (>= 4.2.0) hashdiff (0.3.4) - i18n (0.8.1) + i18n (0.9.5) + concurrent-ruby (~> 1.0) json-schema (2.8.0) addressable (>= 2.4) json-schema_builder (0.0.9) @@ -83,19 +84,19 @@ GEM json-schema (~> 2.5) jsonapi-renderer (0.1.2) jwt (1.5.6) - kaminari (1.0.1) + kaminari (1.2.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.0.1) - kaminari-activerecord (= 1.0.1) - kaminari-core (= 1.0.1) - kaminari-actionview (1.0.1) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) actionview - kaminari-core (= 1.0.1) - kaminari-activerecord (1.0.1) + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) activerecord - kaminari-core (= 1.0.1) - kaminari-core (1.0.1) - loofah (2.2.3) + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) + loofah (2.7.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.6.5) @@ -105,11 +106,11 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.4.0) - minitest (5.10.2) + minitest (5.14.1) multi_json (1.12.1) multipart-post (2.0.0) nio4r (2.0.0) - nokogiri (1.10.4) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) panoptes-client (0.3.0) faraday @@ -148,8 +149,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) railties (5.1.1) actionpack (= 5.1.1) activesupport (= 5.1.1) @@ -194,7 +195,7 @@ GEM sprockets (>= 3.0.0) thor (0.19.4) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.7) thread_safe (~> 0.1) webmock (3.0.1) addressable (>= 2.3.6) @@ -215,7 +216,7 @@ DEPENDENCIES json-schema (~> 2.8) json-schema_builder (~> 0.0) jwt (~> 1.5) - kaminari (~> 1.0) + kaminari (~> 1.2) panoptes-client (~> 0.3) pg (~> 0.20) pry (~> 0.10)