From 25c5873a86ea81360eb06e025c828ffb78471a7e Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Mon, 12 Mar 2018 10:34:27 +0100
Subject: [PATCH] Go back to official smartlisting gem

---
 Gemfile      |  5 +----
 Gemfile.lock | 18 ++++++------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index ecc62f822..8436ad730 100644
--- a/Gemfile
+++ b/Gemfile
@@ -75,10 +75,7 @@ gem 'hashie'
 
 gem 'mailjet'
 
-# FIXME: this is a fork, go back to official version
-# once https://github.com/Sology/smart_listing/pull/139
-# has been merged and released
-gem 'smart_listing', git: 'https://github.com/mizinsky/smart_listing.git', branch: 'kaminari-update'
+gem 'smart_listing'
 
 gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 8771888db..8dd66b411 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -25,17 +25,6 @@ GIT
       open4 (~> 1.3.4)
       rake
 
-GIT
-  remote: https://github.com/mizinsky/smart_listing.git
-  revision: bcdd4f25954fc6f4faa3d6ea6ea9a69c65da678b
-  branch: kaminari-update
-  specs:
-    smart_listing (1.2.1)
-      coffee-rails
-      jquery-rails
-      kaminari (>= 0.17)
-      rails (>= 3.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -703,6 +692,11 @@ GEM
       tilt (~> 2.0)
     skylight (1.5.1)
       activesupport (>= 3.0.0)
+    smart_listing (1.2.2)
+      coffee-rails
+      jquery-rails
+      kaminari (>= 0.17)
+      rails (>= 3.2)
     spreadsheet_architect (1.4.8)
       axlsx (>= 2.0)
       rodf (= 0.3.7)
@@ -853,7 +847,7 @@ DEPENDENCIES
   shoulda-matchers
   simple_form
   skylight
-  smart_listing!
+  smart_listing
   spreadsheet_architect (~> 1.4.8)
   spring
   spring-commands-rspec