diff --git a/Gemfile b/Gemfile index 3964661..fae3e67 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,7 @@ gem 'platipus', '~> 0.1.0' gem 'petergate', '~> 1.8', '>= 1.8.1' gem 'ckeditor', '~> 4.2' gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.2' -gem 'kaminari', '~> 1.1', '>= 1.1.1' +gem 'kaminari', '~> 1.2' gem 'jquery-ui-rails', '~> 6.0', '>= 6.0.1' gem 'carrierwave', '~> 1.2', '>= 1.2.2' gem 'mini_magick', '~> 4.8' diff --git a/Gemfile.lock b/Gemfile.lock index d2479c7..ea618c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,7 +65,7 @@ GEM popper_js (>= 1.12.9, < 2) sass (>= 3.5.2) buftok (0.2.0) - builder (3.2.3) + builder (3.2.4) byebug (10.0.2) carrierwave (1.2.3) activemodel (>= 4.0.0) @@ -89,8 +89,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) - crass (1.0.4) + concurrent-ruby (1.1.6) + crass (1.0.6) devise (4.5.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -104,7 +104,7 @@ GEM dotenv (= 2.5.0) railties (>= 3.2, < 6.0) equalizer (0.0.11) - erubi (1.7.1) + erubi (1.9.0) execjs (2.7.0) ffi (1.9.25) font-awesome-rails (4.7.0.4) @@ -123,7 +123,7 @@ GEM domain_name (~> 0.5) http-form_data (2.1.1) http_parser.rb (0.6.0) - i18n (1.1.0) + i18n (1.8.2) concurrent-ruby (~> 1.0) jbuilder (2.7.0) activesupport (>= 4.2.0) @@ -135,23 +135,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.2) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -164,14 +164,14 @@ GEM mime-types-data (3.2018.0812) mini_magick (4.9.2) mini_mime (1.0.1) - mini_portile2 (2.3.0) - minitest (5.11.3) + mini_portile2 (2.4.0) + minitest (5.14.1) multi_json (1.13.1) multipart-post (2.0.0) naught (1.1.0) nio4r (2.3.1) - nokogiri (1.8.4) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) petergate (1.8.1) activerecord (> 4.0.0) @@ -204,8 +204,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) railties (5.1.6) actionpack (= 5.1.6) activesupport (= 5.1.6) @@ -265,7 +265,7 @@ GEM multipart-post (~> 2.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.1.19) execjs (>= 0.3.0, < 3) @@ -302,11 +302,11 @@ DEPENDENCIES jbuilder (~> 2.5) jquery-rails jquery-ui-rails (~> 6.0, >= 6.0.1) - kaminari (~> 1.1, >= 1.1.1) + kaminari (~> 1.2) listen (>= 3.0.5, < 3.2) mini_magick (~> 4.8) - pg (~> 0.18) petergate (~> 1.8, >= 1.8.1) + pg (~> 0.18) platipus (~> 0.1.0) pry-byebug puma (~> 3.7)