diff --git a/Gemfile b/Gemfile index 58daf7d..ecb8e3a 100644 --- a/Gemfile +++ b/Gemfile @@ -53,7 +53,7 @@ gem 'country_select', '~> 2.5' gem 'countries', require: 'countries/global' gem 'figaro', '~> 1.1.1' gem 'jbuilder', '~> 2.6' -gem 'kaminari', '~> 0.17.0' +gem 'kaminari', '~> 1.2.1' gem 'redcarpet', '~> 3.3' gem 'ruby-oembed', '~> 0.10.1' gem 'sequenced', '~> 3.1' diff --git a/Gemfile.lock b/Gemfile.lock index 52427ef..352204d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ GEM bower (0.0.5) multi_json brakeman (3.7.2) - builder (3.2.3) + builder (3.2.4) bullet (5.7.5) activesupport (>= 3.0.0) uniform_notifier (~> 1.11.0) @@ -118,7 +118,7 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.6) connection_pool (2.2.2) coolline (0.5.0) unicode_utils (~> 1.4) @@ -385,9 +385,18 @@ GEM turbolinks json (1.8.6) jwt (2.2.1) - 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) launchy (2.4.3) addressable (~> 2.3) letter_opener (1.6.0) @@ -396,7 +405,7 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.4.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.13) @@ -418,7 +427,7 @@ GEM mini_magick (4.9.4) mini_mime (1.0.0) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.14.1) multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) @@ -426,7 +435,7 @@ GEM rails (>= 3.1.0) nenv (0.3.0) netrc (0.11.0) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) notiffany (0.1.1) nenv (~> 0.1) @@ -479,8 +488,8 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-footnotes (4.1.8) rails (>= 3.2) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) @@ -621,7 +630,7 @@ GEM turbolinks (5.1.1) turbolinks-source (~> 5.1) turbolinks-source (5.1.0) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) @@ -688,7 +697,7 @@ DEPENDENCIES jbuilder (~> 2.6) jquery-rails (~> 4.2) jquery-turbolinks (~> 2.1.0) - kaminari (~> 0.17.0) + kaminari (~> 1.2.1) letter_opener (~> 1.4) mandrill-api (~> 1.0.53) memory_profiler (~> 0.9.6)