diff --git a/Gemfile b/Gemfile index a10d1143..7cb790cb 100644 --- a/Gemfile +++ b/Gemfile @@ -90,7 +90,7 @@ gem 'haml', '~> 5.0.4' gem 'inline_svg', '~> 1.4.0' gem 'intercom-rails', '~> 0.3.4' gem 'json', '~> 2.1.0' -gem 'kaminari', '~> 0.17.0' +gem 'kaminari', '~> 1.2.1' gem 'liquid', '~> 4.0.0' gem 'nav_lynx', '~> 1.1.1' gem 'nokogiri', '~> 1.10.3' diff --git a/Gemfile.lock b/Gemfile.lock index c69a6e96..47df91f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -850,7 +850,7 @@ GEM sassc-rails (>= 2.0.0) brakeman (3.3.5) browser (2.5.1) - builder (3.2.3) + builder (3.2.4) bullet (6.0.1) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) @@ -877,7 +877,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) connection_pool (2.2.1) counter_culture (1.5.1) activerecord (>= 3.0.0) @@ -885,7 +885,7 @@ GEM after_commit_action (~> 1.0) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) + crass (1.0.6) css_parser (1.5.0) addressable csv_shaper (1.3.0) @@ -913,7 +913,7 @@ GEM activesupport (~> 5.0) request_store (~> 1.0) errbase (0.1.1) - erubi (1.8.0) + erubi (1.9.0) execjs (2.7.0) factory_girl (4.8.0) activesupport (>= 3.0.0) @@ -955,9 +955,18 @@ GEM railties (>= 3.2.16) json (2.1.0) jwt (1.5.6) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + kaminari (1.2.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) + actionview + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) + activerecord + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) kramdown (1.17.0) launchy (2.4.3) addressable (~> 2.3) @@ -971,7 +980,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.2.3) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -987,7 +996,7 @@ GEM mimemagic (0.3.3) mini_mime (1.0.1) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.14.1) multi_json (1.13.1) multipart-post (2.1.1) mustermann (1.0.3) @@ -1036,7 +1045,7 @@ GEM puma (3.12.1) pundit-matchers (1.6.0) rspec-rails (>= 3.0.0) - rack (2.0.7) + rack (2.2.2) rack-affiliates (0.4.0) rack rack-contrib (2.1.0) @@ -1077,8 +1086,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_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging @@ -1226,7 +1235,7 @@ GEM builder (>= 2.1.2) jwt (~> 1.0) multi_json (>= 1.3.0) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) @@ -1292,7 +1301,7 @@ DEPENDENCIES jquery-rails jquery-ui-rails json (~> 2.1.0) - kaminari (~> 0.17.0) + kaminari (~> 1.2.1) launchy (~> 2.4.3) liquid (~> 4.0.0) listen (~> 3.1.5)