diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-02-01 06:03:21 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-02-01 06:03:21 -0800 |
| commit | 21735d225d43b389baf0cc3ed32b9ccc0000e08d (patch) | |
| tree | 1965e60f201f5bea2d9b7e9f0995a15f24da18ff | |
| parent | 1444ec6c912b9a876447e9dc9085ccecaa630407 (diff) | |
| parent | c8c84397cdbd44f47ff9f8594a3dabfe8b3b1502 (diff) | |
| download | rails-21735d225d43b389baf0cc3ed32b9ccc0000e08d.tar.gz rails-21735d225d43b389baf0cc3ed32b9ccc0000e08d.tar.bz2 rails-21735d225d43b389baf0cc3ed32b9ccc0000e08d.zip | |
Merge pull request #4815 from kennyj/fix_4749
Fix GH #4749. Remove branch options, because edge is not 3-2-stable.
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 | ||||
| -rw-r--r-- | railties/test/generators/shared_generator_tests.rb | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 0a73271834..aadb8b94da 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', :branch => '3-2-stable' - gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git', :branch => '3-2-stable' + gem 'sass-rails', :git => 'git://github.com/rails/sass-rails.git' + gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git' # See https://github.com/sstephenson/execjs#readme for more supported runtimes #{javascript_runtime_gemfile_entry} diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index 1534f0d828..b558ef8276 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -126,6 +126,11 @@ module SharedGeneratorTests generator([destination_root], :edge => true).expects(:bundle_command).with('install').once quietly { generator.invoke_all } assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/rails.git")}["']$} + assert_file 'Gemfile', %r{^gem\s+["']journey["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/journey.git")}["']$} + assert_file 'Gemfile', %r{^gem\s+["']arel["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/arel.git")}["']$} + + assert_file 'Gemfile', %r{^\s+gem\s+["']sass-rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/sass-rails.git")}["']$} + assert_file 'Gemfile', %r{^\s+gem\s+["']coffee-rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/coffee-rails.git")}["']$} end def test_skip_gemfile |