spree_core 3.5.0.rc2 → 3.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/spree/core/engine.rb +3 -3
  3. data/lib/spree/core/version.rb +1 -1
  4. data/spree_core.gemspec +2 -2
  5. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a4fca3de896bb0591ba9d103ab1e82973337e93e
4
- data.tar.gz: 1d2234919358861241bb21957271dbc1dfc18794
3
+ metadata.gz: aea028c2069b49ee38182faa56c4818767b3d02d
4
+ data.tar.gz: 8b01d8133a9364ff70aec61baf693b0f466647c2
5
5
  SHA512:
6
- metadata.gz: d877f0cd38820656f8a3765d1632c77d08a4b028bc87c7ea965553228cdf9d3e7a06c6cb95acdebd425d66f317db9b6dd1f1c80ce132ec8d2c0ed9c51020473a
7
- data.tar.gz: dfa66a216e64df35df31c725b3703c5de810d0450427e4832212270e361b4cf224ce618d42be628a02417f355c639da164b7d11dfa9bde40d731218b5f2da1cf
6
+ metadata.gz: 66f8a7892aa4010aada8c11280850eba132b600d33c1f0f51118ae082229c8c20226c8149e293447fa182681dec5ec8390f3c79b9ff9dbde027e6e81b1e20927
7
+ data.tar.gz: 77924f4682926e7d13a3e5dde1c142cdb31a1cb3f16fb139fc358791551b8357ff4cc916d4dc73a2fcf3e97ca009ec869ba9a36d41f043bd346ac7c4309f8756
data/lib/spree/core/engine.rb CHANGED
@@ -116,12 +116,12 @@ module Spree
116
116
  end
117
117
 
118
118
  config.to_prepare do
119
- # Load spree locales before decorators
120
- I18n.load_path += Dir.glob(
119
+ # Ensure spree locale paths are present before decorators
120
+ I18n.load_path.unshift(*(Dir.glob(
121
121
  File.join(
122
122
  File.dirname(__FILE__), '../../../config/locales', '*.{rb,yml}'
123
123
  )
124
- )
124
+ ) - I18n.load_path))
125
125
 
126
126
  # Load application's model / class decorators
127
127
  Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
data/lib/spree/core/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Spree
2
2
  def self.version
3
- '3.5.0.rc2'
3
+ '3.5.0'
4
4
  end
5
5
  end
data/spree_core.gemspec CHANGED
@@ -31,8 +31,8 @@ Gem::Specification.new do |s|
31
31
  s.add_dependency 'highline', '~> 1.6.18' # Necessary for the install generator
32
32
  s.add_dependency 'kaminari', '~> 1.0.1'
33
33
  s.add_dependency 'monetize', '~> 1.1'
34
- s.add_dependency 'paperclip', '~> 5.2.0'
35
- s.add_dependency 'paranoia', '~> 2.3.0'
34
+ s.add_dependency 'paperclip', '~> 6.0.0'
35
+ s.add_dependency 'paranoia', '~> 2.4.1'
36
36
  s.add_dependency 'premailer-rails'
37
37
  s.add_dependency 'acts-as-taggable-on', '~> 5.0'
38
38
  s.add_dependency 'rails', '~> 5.1.5'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.5.0.rc2
4
+ version: 3.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-05-28 00:00:00.000000000 Z
11
+ date: 2018-06-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemerchant
@@ -170,28 +170,28 @@ dependencies:
170
170
  requirements:
171
171
  - - "~>"
172
172
  - !ruby/object:Gem::Version
173
- version: 5.2.0
173
+ version: 6.0.0
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
178
  - - "~>"
179
179
  - !ruby/object:Gem::Version
180
- version: 5.2.0
180
+ version: 6.0.0
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: paranoia
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
185
  - - "~>"
186
186
  - !ruby/object:Gem::Version
187
- version: 2.3.0
187
+ version: 2.4.1
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
192
  - - "~>"
193
193
  - !ruby/object:Gem::Version
194
- version: 2.3.0
194
+ version: 2.4.1
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: premailer-rails
197
197
  requirement: !ruby/object:Gem::Requirement