spree_core 3.1.0.rc1 → 3.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9219224ab5da53304d7ad652d631ab7b0d010b3
-  data.tar.gz: 20e8d4a23103d61d0495758998f4909aae5f3968
+  metadata.gz: 2021478be4f65fcaf33591300ec1f868d5e2fbc2
+  data.tar.gz: 149faf040e1790e29d1d08a97bfc38753ebc2b01
 SHA512:
-  metadata.gz: f2f0bb0ccba4cf1bbee4db6545d530b7d42dc73ce10421eb9ec75ad0e55a26db33f353f2af95838d50340cf3158462561213704da6d57347dbeaca27da921b74
-  data.tar.gz: 56bc2c126244a948cf1c2b951161fcabf7604f07551df8451833f65499005e841f193c87248998f5825bb4c6323d4073989fefd86aeaf648d6daad2bfe9bfa1b
+  metadata.gz: 4b9b8a1fd4613b943c2b2b2528e2f59097c7482c2beaf9a19429a9a8fc51bc270766613ab5b0704a0a47953409f3c1daa0701e2bb4b1aee029fd758a50523457
+  data.tar.gz: 598aa342a0ed6c1a3943f809721b9698d2c251fd73bbe71c654b5ecbb9eef85c1423c320a66ebde8b09b431b3e59c1cecdf50c780a25ced54aab4a33d2648802

data/app/models/spree/shipping_method.rb

@@ -28,7 +28,7 @@ module Spree
 
     def include?(address)
       return false unless address
-      zones.any? do |zone|
+      zones.includes(:zone_members).any? do |zone|
         zone.include?(address)
       end
     end

data/app/models/spree/stock_item.rb

@@ -23,6 +23,7 @@ module Spree
     after_touch { variant.touch }
 
     self.whitelisted_ransackable_attributes = ['count_on_hand', 'stock_location_id']
+    self.whitelisted_ransackable_associations = ['variant']
 
     scope :with_active_stock_location, -> { joins(:stock_location).merge(Spree::StockLocation.active) }
 

data/config/locales/en.yml

@@ -1159,6 +1159,7 @@ en:
     report: Report
     reports: Reports
     resellable: Resellable
+    resend: Resend
     reset_password: Reset my password
     response_code: Response Code
     resume: resume

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.1.0.rc1"
+    "3.1.0.rc2"
   end
 end

data/spree_core.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.add_dependency 'activemerchant', '~> 1.47.0'
-  s.add_dependency 'acts_as_list', '~> 0.6'
+  s.add_dependency 'acts_as_list', '0.7.2'
   s.add_dependency 'awesome_nested_set', '~> 3.0.1'
   s.add_dependency 'carmen', '~> 1.0.0'
   s.add_dependency 'cancancan', '~> 1.10.1'
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'highline', '~> 1.6.18' # Necessary for the install generator
   s.add_dependency 'kaminari', '~> 0.15', '>= 0.15.1'
   s.add_dependency 'monetize', '~> 1.1'
-  s.add_dependency 'paperclip', '~> 4.2.0'
+  s.add_dependency 'paperclip', '~> 4.3.0'
   s.add_dependency 'paranoia', '~> 2.1.0'
   s.add_dependency 'premailer-rails'
   s.add_dependency 'rails', '~> 4.2.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc1
+  version: 3.1.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -28,16 +28,16 @@ dependencies:
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement