Merge pull request #5605 from luisramos0/spree_rev

Update spree revision and upgrade ransack to 1.2.3

Gemfile

@@ -33,7 +33,7 @@ gem 'httparty', '~> 0.11' # For checking alerts.
 gem 'json', '>= 1.7.7'
 gem 'money', '5.1.1'
 gem 'paranoia', '~> 2.0'
-gem 'ransack', '1.0.0'
+gem 'ransack', '~> 1.2.3'
 gem 'state_machine', '1.2.0'
 gem 'stringex', '~> 1.5.1'
 

Gemfile.lock

@@ -22,7 +22,7 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/spree.git
-  revision: f9264ebca0d8dd932a7dbee471514a3b85774c8f
+  revision: 0b0c422369c82b6dd7e7cb627a24e3a9fca19a6c
   branch: 2-1-0-stable
   specs:
     spree_core (2.1.0)
@@ -39,8 +39,8 @@ GIT
       money (= 5.1.1)
       paperclip (~> 3.4.1)
       paranoia (~> 2.0)
-      rails (~> 4.0.0)
-      ransack (= 1.0.0)
+      rails (~> 4.0)
+      ransack (~> 1.0)
       state_machine (= 1.2.0)
       stringex (~> 1.5.1)
       truncate_html (= 0.9.2)
@@ -500,7 +500,7 @@ GEM
     paypal-sdk-merchant (1.106.1)
       paypal-sdk-core (~> 0.2.3)
     pg (0.21.0)
-    polyamorous (0.6.4)
+    polyamorous (1.0.0)
       activerecord (>= 3.0)
     power_assert (1.2.0)
     pry (0.12.2)
@@ -540,10 +540,12 @@ GEM
     rainbow (3.0.0)
     raindrops (0.19.1)
     rake (13.0.1)
-    ransack (1.0.0)
+    ransack (1.2.3)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
-      polyamorous (~> 0.6.0)
+      activesupport (>= 3.0)
+      i18n
+      polyamorous (~> 1.0.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -774,7 +776,7 @@ DEPENDENCIES
   rails (~> 4.0.13)
   rails-i18n (~> 4.0)
   rails_safe_tasks (~> 1.0)
-  ransack (= 1.0.0)
+  ransack (~> 1.2.3)
   redcarpet
   roadie-rails (~> 1.3.0)
   roo (~> 2.8.3)