diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-06 10:39:13 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-06 10:39:13 -0800 |
commit | dd54137e82852ce3a62ce20ecc8550f1ca3a9f96 (patch) | |
tree | a1956726af8e5cc307e72917ff19302b5fff360c | |
parent | ab44418881c80b757ebd50fb026cae91894fbe6a (diff) | |
parent | 995c076d34e87e52ec0f09697b9331cc021fce1b (diff) | |
download | rails-dd54137e82852ce3a62ce20ecc8550f1ca3a9f96.tar.gz rails-dd54137e82852ce3a62ce20ecc8550f1ca3a9f96.tar.bz2 rails-dd54137e82852ce3a62ce20ecc8550f1ca3a9f96.zip |
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)
-rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index aadb8b94da..4efb643d44 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -200,8 +200,8 @@ module Rails # 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} |