diff options
| author | José Valim <jose.valim@gmail.com> | 2010-09-04 00:31:35 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-04 00:31:43 +0200 |
| commit | 23a9455962f0362cf242ffa96db7a9e7fdb0804b (patch) | |
| tree | c046d1285d078649db6833fa1b73a6c23f7f16ea /actionpack/lib/action_controller/base.rb | |
| parent | 63032c1162e96d3380168ca63ac42aa044dbebd6 (diff) | |
| parent | c3c1a1e14859e6716970283caeab0c4c3720862e (diff) | |
| download | rails-23a9455962f0362cf242ffa96db7a9e7fdb0804b.tar.gz rails-23a9455962f0362cf242ffa96db7a9e7fdb0804b.tar.bz2 rails-23a9455962f0362cf242ffa96db7a9e7fdb0804b.zip | |
This commit merges most of the work done by Piotr Sarnacki in his Ruby Summer of Code project.
His work brings several capabilities from app to engines, as routes, middleware stack, asset handling and much more. Please check Rails::Engine documentation for more refenrences.
Merge remote branch 'drogus/engines'
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 7a1464c2aa..b37bc02127 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -221,11 +221,6 @@ module ActionController # Rails 2.x compatibility include ActionController::Compatibility - def self.inherited(klass) - super - klass.helper :all if klass.superclass == ActionController::Base - end - ActiveSupport.run_load_hooks(:action_controller, self) end -end
\ No newline at end of file +end |