diff --git a/Gemfile b/Gemfile index ac3d30b..41c8f4e 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,7 @@ gem 'cocoon', '~> 1.2.14' gem 'devise', '~> 4.7.1' gem 'friendly_id', '~> 5.2.4' gem 'jquery-rails', '~> 4.3', '>= 4.3.3' -gem 'kaminari', '~> 1.1.0' +gem 'kaminari', '~> 1.2.1' gem 'pundit', '~> 2.0.1' gem 'rollbar', '~> 2.18.0' gem 'simple_form', '~> 5.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 3965586..76e1d75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,18 +119,18 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) jwt (2.2.1) - 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) @@ -312,7 +312,7 @@ DEPENDENCIES friendly_id (~> 5.2.4) jbuilder (~> 2.5) jquery-rails (~> 4.3, >= 4.3.3) - kaminari (~> 1.1.0) + kaminari (~> 1.2.1) listen (>= 3.0.5, < 3.2) nokogiri (~> 1.11.0.rc2) omniauth-google-oauth2