From 806ba94a2ea0738d0411dd9eb6359d692128288e Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 5 Aug 2019 14:10:13 +0100
Subject: [PATCH] Clarify dependency on kaminari gem

---
 Gemfile      | 4 ++++
 Gemfile.lock | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Gemfile b/Gemfile
index 34c1e30f8f..88be5da184 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,6 +49,10 @@ gem 'delayed_job_web'
 # When merged, revert to upstream gem
 gem 'simple_form', github: 'RohanM/simple_form'
 
+# Spree's default pagination gem (locked to the current version used by Spree)
+# We use it's methods in OFN code as well, so this is a direct dependency
+gem 'kaminari', '~> 0.14.1'
+
 gem 'andand'
 gem 'angularjs-rails', '1.5.5'
 gem 'aws-sdk'
diff --git a/Gemfile.lock b/Gemfile.lock
index be1fe71d84..7056dd1b71 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -808,6 +808,7 @@ DEPENDENCIES
   jquery-rails (= 3.0.4)
   json_spec (~> 1.1.4)
   jwt (~> 2.2)
+  kaminari (~> 0.14.1)
   knapsack
   letter_opener (>= 1.4.1)
   listen (= 3.0.8)