diff options
| author | José Valim <jose.valim@gmail.com> | 2011-06-29 09:39:41 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-06-29 09:41:16 -0300 |
| commit | c690b7124d2f2206342d11aebb7aa3fc990046d2 (patch) | |
| tree | 1d4e0bc6a60c46ae7e2e6fed8965320ed997f208 /actionpack/lib/action_controller | |
| parent | 4106245530bc573c035fe70e8fc8633e89741abd (diff) | |
| download | rails-c690b7124d2f2206342d11aebb7aa3fc990046d2.tar.gz rails-c690b7124d2f2206342d11aebb7aa3fc990046d2.tar.bz2 rails-c690b7124d2f2206342d11aebb7aa3fc990046d2.zip | |
[IMPORTANT] Make "sprockets/railtie" require explicit.
This makes "sprockets/railtie" explicit. This means that sprockets will
be loaded when you require "rails/all". If you are not using requiring
"rails/all", you need to manually load it with all other framework
railties.
In order to be complete, this commit also adds --skip-sprockets to
the rails generator.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index d2ba052c8d..f0c29825ba 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -4,7 +4,6 @@ require "action_dispatch/railtie" require "action_view/railtie" require "abstract_controller/railties/routes_helpers" require "action_controller/railties/paths" -require "sprockets/railtie" module ActionController class Railtie < Rails::Railtie |