diff --git a/Gemfile b/Gemfile
old mode 100755
new mode 100644
index 303ea98..0518b2c
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem 'bcrypt', '~> 3.1.7'
 gem 'jwt', '~> 1.5'
 gem 'colorize', '~> 0.8'
 gem 'geocoder', '~> 1.3'
-gem 'kaminari', '~> 0.17'
+gem 'kaminari', '~> 1.2'
 gem 'api-pagination', '~> 4.3'
 gem 'newrelic_rpm', '~> 3.16'
 gem 'lograge', '~> 0.4.1'
diff --git a/Gemfile.lock b/Gemfile.lock
old mode 100755
new mode 100644
index 851b120..3a432bb
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,7 +48,7 @@ GEM
     api-pagination (4.3.0)
     arel (7.0.0)
     bcrypt (3.1.11)
-    builder (3.2.2)
+    builder (3.2.4)
     byebug (9.0.5)
     capistrano (3.5.0)
       airbrussh (>= 1.0.0)
@@ -69,7 +69,8 @@ GEM
       capistrano (~> 3.1)
       sshkit (~> 1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     erubis (2.7.0)
@@ -82,14 +83,24 @@ GEM
     geocoder (1.3.7)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    i18n (0.7.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     json (1.8.3)
     jsonapi (0.1.1.beta2)
       json (~> 1.8)
     jwt (1.5.4)
-    kaminari (0.17.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    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)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -98,7 +109,8 @@ GEM
       actionpack (>= 4, < 5.1)
       activesupport (>= 4, < 5.1)
       railties (>= 4, < 5.1)
-    loofah (2.0.3)
+    loofah (2.5.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
@@ -106,19 +118,17 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    mini_portile2 (2.4.0)
+    minitest (5.14.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
     newrelic_rpm (3.16.3.323)
     nio4r (1.2.1)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
     pg (0.18.4)
-    pkg-config (1.1.7)
-    rack (2.0.1)
+    rack (2.2.2)
     rack-cors (0.4.0)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -134,11 +144,11 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 5.0.0)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.1)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     railties (5.0.0)
       actionpack (= 5.0.0)
       activesupport (= 5.0.0)
@@ -182,8 +192,8 @@ GEM
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
@@ -207,7 +217,7 @@ DEPENDENCIES
   factory_girl_rails
   geocoder (~> 1.3)
   jwt (~> 1.5)
-  kaminari (~> 0.17)
+  kaminari (~> 1.2)
   listen
   lograge (~> 0.4.1)
   newrelic_rpm (~> 3.16)