Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix sass-rails dependency. Closes #3704.

  • Loading branch information...
commit 36cefec6397a57068b63f9a80afae50374597910 1 parent 574ed06
@jonleighton jonleighton authored
View
4 railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Rails 3.1.3 (unreleased) ##
+
+* New apps should be generated with a sass-rails dependency of 3.1.5, not 3.1.5.rc.2
+
## Rails 3.1.2 (unreleased) ##
* Engines: don't blow up if db/seeds.rb is missing.
View
2  railties/lib/rails/generators/app_base.rb
@@ -209,7 +209,7 @@ def assets_gemfile_entry
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', #{options.dev? || options.edge? ? " :git => 'git://github.com/rails/sass-rails.git', :branch => '3-1-stable'" : " '~> 3.1.5.rc.2'"}
+ gem 'sass-rails', #{options.dev? || options.edge? ? " :git => 'git://github.com/rails/sass-rails.git', :branch => '3-1-stable'" : " '~> 3.1.5'"}
gem 'coffee-rails', #{options.dev? || options.edge? ? ":git => 'git://github.com/rails/coffee-rails.git', :branch => '3-1-stable'" : "'~> 3.1.1'"}
gem 'uglifier', '>= 1.0.3'
end
Please sign in to comment.
Something went wrong with that request. Please try again.