Bump to Rails 3.2.6

As per: http://weblog.rubyonrails.org/2012/6/12/ann-rails-3-2-6-has-been-released/
spree · Jun 12, 2012 · d9d6675 · d9d6675
1 parent 990a705
commit d9d6675
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/lib/generators/spree/dummy/templates/rails/application.rb b/core/lib/generators/spree/dummy/templates/rails/application.rb
@@ -2,7 +2,7 @@
 
 require 'rails/all'
 
-Bundler.require(*Rails.groups)
+Bundler.require(*Rails.groups(:assets => %w(development test)))
 
 require '<%= lib_name %>'
 

diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'aws-sdk', '~> 1.3.4'
   s.add_dependency 'ransack', '~> 0.6.0'
   s.add_dependency 'activemerchant', '= 1.20.4'
-  s.add_dependency 'rails', '~> 3.2.5'
+  s.add_dependency 'rails', '~> 3.2.6'
   s.add_dependency 'kaminari', '>= 0.13.0'
   s.add_dependency 'deface', '>= 0.8.0'
   s.add_dependency 'stringex', '~> 1.3.2'