spree_core 3.5.0.rc2 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4fca3de896bb0591ba9d103ab1e82973337e93e
-  data.tar.gz: 1d2234919358861241bb21957271dbc1dfc18794
+  metadata.gz: aea028c2069b49ee38182faa56c4818767b3d02d
+  data.tar.gz: 8b01d8133a9364ff70aec61baf693b0f466647c2
 SHA512:
-  metadata.gz: d877f0cd38820656f8a3765d1632c77d08a4b028bc87c7ea965553228cdf9d3e7a06c6cb95acdebd425d66f317db9b6dd1f1c80ce132ec8d2c0ed9c51020473a
-  data.tar.gz: dfa66a216e64df35df31c725b3703c5de810d0450427e4832212270e361b4cf224ce618d42be628a02417f355c639da164b7d11dfa9bde40d731218b5f2da1cf
+  metadata.gz: 66f8a7892aa4010aada8c11280850eba132b600d33c1f0f51118ae082229c8c20226c8149e293447fa182681dec5ec8390f3c79b9ff9dbde027e6e81b1e20927
+  data.tar.gz: 77924f4682926e7d13a3e5dde1c142cdb31a1cb3f16fb139fc358791551b8357ff4cc916d4dc73a2fcf3e97ca009ec869ba9a36d41f043bd346ac7c4309f8756

data/lib/spree/core/engine.rb

@@ -116,12 +116,12 @@ module Spree
       end
 
       config.to_prepare do
-        # Load spree locales before decorators
-        I18n.load_path += Dir.glob(
+        # Ensure spree locale paths are present before decorators
+        I18n.load_path.unshift(*(Dir.glob(
           File.join(
             File.dirname(__FILE__), '../../../config/locales', '*.{rb,yml}'
           )
-        )
+        ) - I18n.load_path))
 
         # Load application's model / class decorators
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.5.0.rc2'
+    '3.5.0'
   end
 end

data/spree_core.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'highline', '~> 1.6.18' # Necessary for the install generator
   s.add_dependency 'kaminari', '~> 1.0.1'
   s.add_dependency 'monetize', '~> 1.1'
-  s.add_dependency 'paperclip', '~> 5.2.0'
-  s.add_dependency 'paranoia', '~> 2.3.0'
+  s.add_dependency 'paperclip', '~> 6.0.0'
+  s.add_dependency 'paranoia', '~> 2.4.1'
   s.add_dependency 'premailer-rails'
   s.add_dependency 'acts-as-taggable-on', '~> 5.0'
   s.add_dependency 'rails', '~> 5.1.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.5.0.rc2
+  version: 3.5.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: premailer-rails
   requirement: !ruby/object:Gem::Requirement