diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-27 15:52:11 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-27 15:52:11 -0700 |
| commit | 745d8a8e80d03e3e30d0d96336b0a052c1dd0219 (patch) | |
| tree | 527e65439e07db848d09c05dfc6dcedf1f3c485d /railties/lib/rails | |
| parent | 86f287e6cfc4181447d936d0d1c0336d944e7327 (diff) | |
| parent | 97ac5ed2a7812bc9b323de84a646165a311271d4 (diff) | |
| download | rails-745d8a8e80d03e3e30d0d96336b0a052c1dd0219.tar.gz rails-745d8a8e80d03e3e30d0d96336b0a052c1dd0219.tar.bz2 rails-745d8a8e80d03e3e30d0d96336b0a052c1dd0219.zip | |
Merge pull request #12668 from arunagw/aa-improvments
Test fixed for app_generator
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index a59a5ce1e0..9640f18aad 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -161,8 +161,8 @@ module Rails [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH), GemfileEntry.github('arel', 'rails/arel')] elsif options.edge? - [GemfileEntry.path('rails', 'rails/rails'), - GemfileEntry.path('arel', 'rails/arel')] + [GemfileEntry.github('rails', 'rails/rails'), + GemfileEntry.github('arel', 'rails/arel')] else [GemfileEntry.version('rails', Rails::VERSION::STRING, @@ -201,7 +201,7 @@ module Rails return [] if options[:skip_sprockets] gems = [] - gemfile = if options.dev? || options.edge? + if options.dev? || options.edge? gems << GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails', 'Use edge version of sprockets-rails') gems << GemfileEntry.github('sass-rails', 'rails/sass-rails', @@ -231,7 +231,7 @@ module Rails def sdoc_gemfile_entry comment = 'bundle exec rake doc:rails generates the API under doc/api.' - GemfileEntry.new('web-console', comment, nil, { :group => :doc, :require => false }) + GemfileEntry.new('sdoc', comment, nil, { :group => :doc, :require => false }) end def coffee_gemfile_entry @@ -259,7 +259,7 @@ module Rails def javascript_runtime_gemfile_entry comment = 'See https://github.com/sstephenson/execjs#readme for more supported runtimes' - runtime = if defined?(JRUBY_VERSION) + if defined?(JRUBY_VERSION) GemfileEntry.version 'therubyrhino', comment, nil else GemfileEntry.new 'therubyracer', comment, nil, { :platforms => :ruby }, true |