From 66d430612a18a838ac3ba224e1cbb711a4952fe1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 May 2020 21:34:11 +0000
Subject: [PATCH] Bump kaminari from 0.16.1 to 1.2.1

Bumps [kaminari](https://github.com/kaminari/kaminari) from 0.16.1 to 1.2.1.
- [Release notes](https://github.com/kaminari/kaminari/releases)
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kaminari/kaminari/compare/v0.16.1...v1.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 37 ++++++++++++++++++++++++-------------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index c56b11d..2b426bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,7 +45,7 @@ gem "therubyracer"
 gem 'shortener', '~> 0.3.0'
 
 # Pagination.
-gem 'kaminari', '~> 0.16.1'
+gem 'kaminari', '~> 1.2.1'
 
 # ZeroClipboard integration, for copying new URLs to the user's clipboard.
 gem 'zeroclipboard-rails', '~> 0.0.13'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ccacd1..4c0e7f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,7 +29,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.6)
     arel (5.0.1.20140414130214)
-    builder (3.2.2)
+    builder (3.2.4)
     byebug (3.1.2)
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
@@ -48,6 +48,7 @@ GEM
       execjs
     coffee-script-source (1.7.0)
     columnize (0.8.9)
+    concurrent-ruby (1.1.6)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     cucumber (2.3.2)
@@ -106,17 +107,27 @@ GEM
       railties (>= 4.0.1)
     highline (1.6.21)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     jbuilder (2.0.7)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    kaminari (0.16.1)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    json (1.8.6)
+    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.2)
       addressable (~> 2.3)
     libv8 (3.16.14.3)
@@ -125,7 +136,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     mini_portile2 (2.0.0)
-    minitest (5.3.3)
+    minitest (5.14.1)
     multi_json (1.10.0)
     multi_test (0.1.2)
     net-ssh (2.9.0)
@@ -133,8 +144,8 @@ GEM
       mini_portile2 (~> 2.0.0.rc2)
     pg (0.17.1)
     polyglot (0.3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.5.5)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.1.1)
       actionmailer (= 4.1.1)
@@ -200,14 +211,14 @@ GEM
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.6)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     turbolinks (2.2.2)
       coffee-rails
-    tzinfo (1.1.0)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uglifier (2.5.0)
       execjs (>= 0.3.0)
@@ -241,7 +252,7 @@ DEPENDENCIES
   haml-rails (~> 0.5.3)
   jbuilder (~> 2.0)
   jquery-rails
-  kaminari (~> 0.16.1)
+  kaminari (~> 1.2.1)
   pg
   rails (= 4.1.1)
   rspec-rails (~> 3.0)
@@ -255,4 +266,4 @@ DEPENDENCIES
   vcr
   webmock
   webrat
-  zeroclipboard-rails (~> 0.0.13)
\ No newline at end of file
+  zeroclipboard-rails (~> 0.0.13)