Merge pull request #2004 from ualbertalib/dependabot/bundler/kaminari…

…-1.2.1 [Security] Bump kaminari from 1.1.1 to 1.2.1
ualbertalib · May 28, 2020 · 1f14694 · 1f14694
2 parents 2a2b27c + cb52263
commit 1f14694
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and releases in Discovery project adheres to [Semantic Versioning](http://semver
 
 ## [Unreleased]
 
+## [3.2.2] - 2020-05-28
+
+### Security
+- Bump kaminari from 1.2.0 to 1.2.1 [PR#2004](https://github.com/ualbertalib/discovery/pull/2004)
+
 ## [3.2.1] - 2020-05-22
 
 ### Fixed

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -186,18 +186,18 @@ 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.1.1)
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
     kramdown (2.2.1)
       rexml
     kramdown-parser-gfm (1.1.0)

diff --git a/config/application.rb b/config/application.rb
@@ -8,7 +8,7 @@
 Bundler.require(*Rails.groups)
 
 module Discovery
-  VERSION = '3.2.1'.freeze # used in application layout meta generator tag
+  VERSION = '3.2.2'.freeze # used in application layout meta generator tag
 
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.