From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 20 Jan 2014 12:00:50 +0000 (+0200)
Subject: Update kaminari
X-Git-Tag: v6.5.0.rc1~2^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=74187621ea0297103bd00d1e98c7e01692f64271;p=wvm%2Fgitlab.git

Update kaminari

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---

diff --git a/Gemfile b/Gemfile
index db256ded3..0d97a7499 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,7 +63,7 @@ gem "stamp"
 gem 'enumerize'
 
 # Pagination
-gem "kaminari", "~> 0.14.1"
+gem "kaminari", "~> 0.15.1"
 
 # HAML
 gem "haml-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index 959a52f7e..a501aefca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -259,7 +259,7 @@ GEM
     json (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    kaminari (0.14.1)
+    kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.8.1)
@@ -281,7 +281,7 @@ GEM
     minitest (4.7.5)
     modernizr (2.6.2)
       sprockets (~> 2.0)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     mysql2 (0.3.11)
@@ -600,7 +600,7 @@ DEPENDENCIES
   jquery-rails (= 2.1.3)
   jquery-turbolinks
   jquery-ui-rails (= 2.0.2)
-  kaminari (~> 0.14.1)
+  kaminari (~> 0.15.1)
   launchy
   letter_opener
   minitest (~> 4.7.0)