diff --git a/rails/Gemfile b/rails/Gemfile index e801831..604f545 100644 --- a/rails/Gemfile +++ b/rails/Gemfile @@ -77,7 +77,7 @@ gem 'rack-cors', :require => 'rack/cors' gem 'sidekiq', '~>4.0' # Kaminari handles pagination -gem 'kaminari', '~> 1.1.1' +gem 'kaminari', '~> 1.2.1' # Kaminari modifier for API headers gem 'api-pagination' diff --git a/rails/Gemfile.lock b/rails/Gemfile.lock index ca8d473..5076559 100644 --- a/rails/Gemfile.lock +++ b/rails/Gemfile.lock @@ -55,7 +55,7 @@ GEM ast (2.4.0) bcrypt (3.1.12) bindex (0.5.0) - builder (3.2.3) + builder (3.2.4) byebug (10.0.2) cancancan (2.3.0) capybara (2.18.0) @@ -88,9 +88,9 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.6) connection_pool (2.2.2) - crass (1.0.4) + crass (1.0.6) devise (4.4.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -103,7 +103,7 @@ GEM diff-lcs (1.3) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - erubi (1.7.1) + erubi (1.9.0) excon (0.62.0) execjs (2.7.0) ffaker (2.7.0) @@ -272,7 +272,7 @@ GEM http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.0.1) + i18n (1.8.2) concurrent-ruby (~> 1.0) inflecto (0.0.2) ipaddress (0.8.3) @@ -282,23 +282,23 @@ GEM multi_json (>= 1.2) json (2.1.0) jsonapi-renderer (0.2.0) - kaminari (1.1.1) + kaminari (1.2.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.1.1) - kaminari-activerecord (= 1.1.1) - kaminari-core (= 1.1.1) - kaminari-actionview (1.1.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.1.1) - kaminari-activerecord (1.1.1) + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) activerecord - kaminari-core (= 1.1.1) - kaminari-core (1.1.1) + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.2) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -309,15 +309,15 @@ GEM mime-types-data (3.2016.0521) mini_magick (4.8.0) mini_mime (1.0.0) - mini_portile2 (2.3.0) - minitest (5.11.3) + mini_portile2 (2.4.0) + minitest (5.14.1) multi_json (1.13.1) mysql2 (0.4.10) netrc (0.11.0) newrelic_rpm (5.2.0.345) nio4r (2.3.1) - nokogiri (1.8.4) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) @@ -354,8 +354,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails-i18n (5.1.1) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) @@ -501,7 +501,7 @@ DEPENDENCIES fog-aws http-accept jbuilder (~> 2.5) - kaminari (~> 1.1.1) + kaminari (~> 1.2.1) listen (>= 3.0.5, < 3.2) mini_magick (~> 4.8.0) mysql2 (>= 0.3.18, < 0.5)