From 5cfcc9ab6a5a9cdd1f466640351af7be04fba387 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 14 Jun 2017 20:01:34 +0630
Subject: [PATCH] fixed pagination

---
 Gemfile      |  3 +--
 Gemfile.lock | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4de32f60..99489d5b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,8 +61,7 @@ gem 'sidekiq'
 #gem 'nokogiri', '~> 1.6'
 
 # Pagination
-gem 'kaminari'
-# gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
+gem 'kaminari', '~> 1.0.1'
 
 # Datatable
 gem 'filterrific'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3a3721d9..e6f683f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,9 +89,18 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    kaminari (0.16.3)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    kaminari (1.0.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.0.1)
+      kaminari-activerecord (= 1.0.1)
+      kaminari-core (= 1.0.1)
+    kaminari-actionview (1.0.1)
+      actionview
+      kaminari-core (= 1.0.1)
+    kaminari-activerecord (1.0.1)
+      activerecord
+      kaminari-core (= 1.0.1)
+    kaminari-core (1.0.1)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -247,7 +256,7 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   jquery-rails
   jquery-ui-rails
-  kaminari
+  kaminari (~> 1.0.1)
   listen (~> 3.0.5)
   mysql2 (>= 0.3.18, < 0.5)
   pg