diff --git a/Gemfile b/Gemfile index 3afde680..39f54a35 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ gem 'carrierwave', '1.2.2' gem 'mini_magick', '4.7.0' gem 'will_paginate', '3.1.6' gem 'bootstrap-will_paginate', '1.0.0' -gem 'kaminari', '~> 1.1.1' +gem 'kaminari', '~> 1.2.1' gem 'fog-aws' gem 'kaminari-bootstrap', '~> 3.0.1' gem 'dotenv-rails' diff --git a/Gemfile.lock b/Gemfile.lock index a71ad56a..3a5039f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -158,26 +158,26 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 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.2.1) kaminari-bootstrap (3.0.1) kaminari (>= 0.13.0) rails - kaminari-core (1.1.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.4.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.4) @@ -333,7 +333,7 @@ GEM multipart-post (~> 2.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) @@ -374,7 +374,7 @@ DEPENDENCIES guard-minitest (= 2.4.4) jbuilder (= 2.7.0) jquery-rails (= 4.3.1) - kaminari (~> 1.1.1) + kaminari (~> 1.2.1) kaminari-bootstrap (~> 3.0.1) listen (= 3.1.5) mini_magick (= 4.7.0)