Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix GH #4749. Remove branch options, because edge is not 3-2-stable.

  • Loading branch information...
commit c8c84397cdbd44f47ff9f8594a3dabfe8b3b1502 1 parent f532cd1
Toshinori Kajihara kennyj authored
4 railties/lib/rails/generators/app_base.rb
@@ -200,8 +200,8 @@ def assets_gemfile_entry
200 200 # Gems used only for assets and not required
201 201 # in production environments by default.
202 202 group :assets do
203   - gem 'sass-rails', :git => 'git://github.com/rails/sass-rails.git', :branch => '3-2-stable'
204   - gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git', :branch => '3-2-stable'
  203 + gem 'sass-rails', :git => 'git://github.com/rails/sass-rails.git'
  204 + gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git'
205 205
206 206 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
207 207 #{javascript_runtime_gemfile_entry}
5 railties/test/generators/shared_generator_tests.rb
@@ -126,6 +126,11 @@ def test_edge_option
126 126 generator([destination_root], :edge => true).expects(:bundle_command).with('install').once
127 127 quietly { generator.invoke_all }
128 128 assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/rails.git")}["']$}
  129 + assert_file 'Gemfile', %r{^gem\s+["']journey["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/journey.git")}["']$}
  130 + assert_file 'Gemfile', %r{^gem\s+["']arel["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/arel.git")}["']$}
  131 +
  132 + assert_file 'Gemfile', %r{^\s+gem\s+["']sass-rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/sass-rails.git")}["']$}
  133 + assert_file 'Gemfile', %r{^\s+gem\s+["']coffee-rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/coffee-rails.git")}["']$}
129 134 end
130 135
131 136 def test_skip_gemfile

0 comments on commit c8c8439

Please sign in to comment.
Something went wrong with that request. Please try again.