solidus_core 1.2.0.rc2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82876c2eaf3d0b1300b8c2d0903d872a5e214d0a
-  data.tar.gz: efacf0ca0cc2faa62b4e67082a2633505640fec9
+  metadata.gz: b1eccab659060bb83cc6fbdd8c8b40aa7d3353b9
+  data.tar.gz: 4428f750ded7e8d5838a8694ed4834e8ac40a4a1
 SHA512:
-  metadata.gz: 011b1113b9957d987204f53c39658fe8cbb33b9b2de60c96034b7fcac038a209a0b8df568b13d77b5866e2d76691ff44f9cb693957ebe792e738cc7aaab51118
-  data.tar.gz: 2256f27042f878a46bc89cea319e8cec4359a085d82b50ab27a406fcbbc96237b199818e046bd3ff16e24ddee2df805c3e74ac94e98f58302a69d8de9ddd3e94
+  metadata.gz: 52be2bcada1f251b797f03ffb2239b625307ed3096c4e86c6e0d716cca1835bd5802aebf9bf45b05ef36261feea2d9dfffd3cd5a31d463c2bd23be640fb70fd3
+  data.tar.gz: 161a67668162e27926be717822db2014a36d1dbd9b419d222c92b571936b504b3850dfa55b16f791facc4302cf8dcbff14faa526651fb53bb2158e3333f4339b

data/config/initializers/assets.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile += %w( logo/solidus_logo.png noimage/*.png )

data/config/locales/en.yml

@@ -1436,6 +1436,7 @@ en:
     stock_movements_for_stock_location: Stock Movements for %{stock_location_name}
     stock_not_below_zero: Stock must not be below zero.
     stock_successfully_transferred: Stock was successfully transferred between locations.
+    stock: Stock
     stock_transfer: Stock Transfer
     stock_transfer_cannot_be_finalized: Stock transfer cannot be finalized
     stock_transfer_complete: Stock Transfer Complete

data/lib/spree/core/version.rb

@@ -5,7 +5,7 @@ module Spree
   end
 
   def self.solidus_version
-    "1.2.0.rc2"
+    "1.2.0"
   end
 
   def self.solidus_gem_version

data/solidus_core.gemspec

@@ -43,5 +43,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'twitter_cldr', '~> 3.0'
 
   s.add_development_dependency 'email_spec', '~> 1.6'
-  s.add_dependency 'sprockets-rails', '~> 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc2
+  version: 1.2.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -338,20 +338,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: Essential models, mailers, and classes for the Solidus e-commerce project.
 email: contact@solidus.io
 executables: []
@@ -604,6 +590,7 @@ files:
 - app/views/spree/shipment_mailer/shipped_email.html.erb
 - app/views/spree/test_mailer/test_email.html.erb
 - app/views/spree/test_mailer/test_email.text.erb
+- config/initializers/assets.rb
 - config/initializers/friendly_id.rb
 - config/initializers/premailer_assets.rb
 - config/initializers/spree_user.rb
@@ -1375,9 +1362,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1