diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-18 01:03:24 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-18 01:03:24 -0300 |
| commit | fc32ff4ee322d46c6658a6a2d484fd5f60c07178 (patch) | |
| tree | f8a016793fa17277ed1b7d4498d2e0af039a3977 /railties/lib/rails | |
| parent | 0c3ca0f013904d40bf11ac9da95ed0ef3d9ddc86 (diff) | |
| download | rails-fc32ff4ee322d46c6658a6a2d484fd5f60c07178.tar.gz rails-fc32ff4ee322d46c6658a6a2d484fd5f60c07178.tar.bz2 rails-fc32ff4ee322d46c6658a6a2d484fd5f60c07178.zip | |
Now the Sprockets railtie lives in sprockets/railtie
Diffstat (limited to 'railties/lib/rails')
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb index eabe566829..6c9c53fc69 100644 --- a/railties/lib/rails/all.rb +++ b/railties/lib/rails/all.rb @@ -5,7 +5,7 @@ require "rails" action_controller action_mailer rails/test_unit - sprockets/rails + sprockets ).each do |framework| begin require "#{framework}/railtie" diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index fb43c90e21..5f15c973c6 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -7,7 +7,7 @@ require 'rails/all' <%= comment_if :skip_active_record %>require "active_record/railtie" require "action_controller/railtie" require "action_mailer/railtie" -<%= comment_if :skip_sprockets %>require "sprockets/rails/railtie" +<%= comment_if :skip_sprockets %>require "sprockets/railtie" <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie" <% end -%> diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb b/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb index 2f9b7fc962..8a8ba04a70 100644 --- a/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb +++ b/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb @@ -7,7 +7,7 @@ require 'rails/all' <%= comment_if :skip_active_record %>require "active_record/railtie" require "action_controller/railtie" require "action_mailer/railtie" -<%= comment_if :skip_sprockets %>require "sprockets/rails/railtie" +<%= comment_if :skip_sprockets %>require "sprockets/railtie" <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie" <% end -%> |