diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-13 14:13:54 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-13 14:31:09 +0200 |
| commit | ab1f91394f630a0a5a9c3de6ed0cb797d3bf56e2 (patch) | |
| tree | 5f769c7f7cfe462affdf2b03f917cbc8bbb0c0dd /railties | |
| parent | 733bfa63f5d8d3b963202b6d3e9f00b4db070b91 (diff) | |
| download | rails-ab1f91394f630a0a5a9c3de6ed0cb797d3bf56e2.tar.gz rails-ab1f91394f630a0a5a9c3de6ed0cb797d3bf56e2.tar.bz2 rails-ab1f91394f630a0a5a9c3de6ed0cb797d3bf56e2.zip | |
Until the latest sprockets gem is released, we need new apps to reference it directly
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 5a8906f035..eba4ea0c95 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -130,24 +130,27 @@ module Rails def rails_gemfile_entry if options.dev? <<-GEMFILE.strip_heredoc - gem 'rails', :path => '#{Rails::Generators::RAILS_DEV_PATH}' - gem 'arel', :git => 'git://github.com/rails/arel.git' - gem 'rack', :git => 'git://github.com/rack/rack.git' + gem 'rails', :path => '#{Rails::Generators::RAILS_DEV_PATH}' + gem 'arel', :git => 'git://github.com/rails/arel.git' + gem 'rack', :git => 'git://github.com/rack/rack.git' + gem 'sprockets', :git => "git://github.com/sstephenson/sprockets.git" GEMFILE elsif options.edge? <<-GEMFILE.strip_heredoc - gem 'rails', :git => 'git://github.com/rails/rails.git' - gem 'arel', :git => 'git://github.com/rails/arel.git' - gem 'rack', :git => 'git://github.com/rack/rack.git' + gem 'rails', :git => 'git://github.com/rails/rails.git' + gem 'arel', :git => 'git://github.com/rails/arel.git' + gem 'rack', :git => 'git://github.com/rack/rack.git' + gem 'sprockets', :git => "git://github.com/sstephenson/sprockets.git" GEMFILE else <<-GEMFILE.strip_heredoc gem 'rails', '#{Rails::VERSION::STRING}' # Bundle edge Rails instead: - # gem 'rails', :git => 'git://github.com/rails/rails.git' - # gem 'arel', :git => 'git://github.com/rails/arel.git' - # gem 'rack', :git => 'git://github.com/rack/rack.git' + # gem 'rails', :git => 'git://github.com/rails/rails.git' + # gem 'arel', :git => 'git://github.com/rails/arel.git' + # gem 'rack', :git => 'git://github.com/rack/rack.git' + # gem 'sprockets', :git => "git://github.com/sstephenson/sprockets.git" GEMFILE end end |