Permalink
Browse files

Merge pull request #4912 from guilleiguaran/fix-edge-gemfile

Add branch to sass-rails and coffee-rails for apps generated with --dev or --edge (3-2-stable)
  • Loading branch information...
2 parents ab44418 + 995c076 commit dd54137e82852ce3a62ce20ecc8550f1ca3a9f96 @tenderlove tenderlove committed Feb 6, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 railties/lib/rails/generators/app_base.rb
@@ -200,8 +200,8 @@ def assets_gemfile_entry
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', :git => 'git://github.com/rails/sass-rails.git'
- gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git'
+ gem 'sass-rails', :git => 'git://github.com/rails/sass-rails.git', :branch => '3-2-stable'
+ gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git', :branch => '3-2-stable'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
#{javascript_runtime_gemfile_entry}

0 comments on commit dd54137

Please sign in to comment.