diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-30 19:33:32 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-30 19:34:15 -0800 |
| commit | 1fbd02e44618f1f56e1d9d0af85c6a4108a66532 (patch) | |
| tree | 53c426130333053cf40e51b8bc00174876ecccc4 /actionpack/lib/action_controller/rails.rb | |
| parent | 10a2638db099baddfa46da98f780df3a72a718d4 (diff) | |
| download | rails-1fbd02e44618f1f56e1d9d0af85c6a4108a66532.tar.gz rails-1fbd02e44618f1f56e1d9d0af85c6a4108a66532.tar.bz2 rails-1fbd02e44618f1f56e1d9d0af85c6a4108a66532.zip | |
Revert "Add config.action_controller.include behavior to plugins."
This reverts commit 7e8b7f46bfc086a36db996420fbee93348c5268e.
Conflicts:
railties/lib/rails/plugin.rb
Diffstat (limited to 'actionpack/lib/action_controller/rails.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rails.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/rails.rb b/actionpack/lib/action_controller/rails.rb index 6ebb50887b..df708c315b 100644 --- a/actionpack/lib/action_controller/rails.rb +++ b/actionpack/lib/action_controller/rails.rb @@ -1,7 +1,6 @@ module ActionController class Plugin < Rails::Plugin plugin_name :action_controller - include_modules_in "ActionController::Base" initializer "action_controller.set_configs" do |app| app.config.action_controller.each do |k,v| @@ -91,4 +90,4 @@ module ActionController end end -end
\ No newline at end of file +end |