diff --git a/Gemfile b/Gemfile index f72b722..1eee69d 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem "bootstrap", "~> 4.3.1" gem "jquery-rails" gem "font-awesome-rails", "~> 4.7", ">= 4.7.0.5" gem "toastr-rails" -gem "kaminari", "~> 1.1", ">= 1.1.1" +gem "kaminari", "~> 1.2" gem "bootstrap4-kaminari-views" gem "config", "~> 2.0" gem "cocoon" diff --git a/Gemfile.lock b/Gemfile.lock index 0cd34b2..4bde9c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,7 +59,7 @@ GEM bootstrap4-kaminari-views (1.0.1) kaminari (>= 0.13) rails (>= 3.1) - builder (3.2.3) + builder (3.2.4) byebug (11.0.1) carrierwave (1.3.1) activemodel (>= 4.0.0) @@ -79,7 +79,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) config (2.0.0) activesupport (>= 4.2) deep_merge (~> 1.2, >= 1.2.1) @@ -91,7 +91,7 @@ GEM country_select (4.0.0) countries (~> 3.0) sort_alphabetical (~> 1.0) - crass (1.0.4) + crass (1.0.6) database_cleaner (1.7.0) deep_merge (1.2.1) devise (4.7.0) @@ -131,7 +131,7 @@ GEM dry-equalizer (~> 0.2, >= 0.2.2) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) - erubi (1.8.0) + erubi (1.9.0) execjs (2.7.0) faker (2.2.0) i18n (>= 0.8) @@ -142,7 +142,7 @@ GEM railties (>= 3.2, < 6.1) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.6.0) + i18n (1.8.2) concurrent-ruby (~> 1.0) i18n_data (0.8.0) io-like (0.3.0) @@ -155,23 +155,23 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - 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.3) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -186,11 +186,11 @@ GEM mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.14.1) msgpack (1.3.1) mysql2 (0.5.2) nio4r (2.5.1) - nokogiri (1.10.4) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) parallel (1.17.0) @@ -222,8 +222,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.2.3) actionpack (= 5.2.3) activesupport (= 5.2.3) @@ -323,7 +323,7 @@ GEM tilt (2.0.9) toastr-rails (1.0.3) railties (>= 3.1.0) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) @@ -362,7 +362,7 @@ DEPENDENCIES jbuilder (~> 2.5) jquery-rails jquery-ui-rails - kaminari (~> 1.1, >= 1.1.1) + kaminari (~> 1.2) listen (>= 3.0.5, < 3.2) mini_magick (~> 4.3) mysql2 (>= 0.4.4, < 0.6.0)