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 /activerecord | |
| 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 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/rails.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/rails.rb b/activerecord/lib/active_record/rails.rb index 8bc49c3d96..a13bd2a5da 100644 --- a/activerecord/lib/active_record/rails.rb +++ b/activerecord/lib/active_record/rails.rb @@ -7,7 +7,6 @@ require "action_controller/rails" module ActiveRecord class Plugin < Rails::Plugin plugin_name :active_record - include_modules_in "ActiveRecord::Base" rake_tasks do load "active_record/railties/databases.rake" |