diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-22 13:11:44 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-22 13:11:44 -0700 |
| commit | f2e65b7d54c3034b35a5f248f2482e760cd85cd5 (patch) | |
| tree | 90acf9d5eb74b74bc5b9d96cd9b93f0151497d0e /railties/lib/rails/generators | |
| parent | 2bc3f81c89c1cd7444d476411bef626173172dc0 (diff) | |
| parent | 6758941898516deca3d4b9ccf2a9eaf46f2f4080 (diff) | |
| download | rails-f2e65b7d54c3034b35a5f248f2482e760cd85cd5.tar.gz rails-f2e65b7d54c3034b35a5f248f2482e760cd85cd5.tar.bz2 rails-f2e65b7d54c3034b35a5f248f2482e760cd85cd5.zip | |
Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable
* '3-2-stable' of github.com:rails/rails:
Use sass-rails >= 3.2.2 for new apps
Make ActiveRecord::Relation#pluck work with serialized attributes
Make read_attribute code path accessible at the class level
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 0b50d7e125..d63754e669 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -211,7 +211,7 @@ module Rails # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails', '~> 3.2.0' + gem 'sass-rails', '~> 3.2.2' gem 'coffee-rails', '~> 3.2.0' #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)} gem 'uglifier', '>= 1.0.3' |