aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-12-31 13:11:54 -0800
committerCarl Lerche <carllerche@mac.com>2009-12-31 13:12:52 -0800
commitae7ada1fde1648a5c81b9e6adf74d515e0bbe0a5 (patch)
tree385b3655a8b8ef5355e4c85f7af81edfab5ef777 /activerecord/lib
parente749424dfa38a0300a621b772eae96f9cc5d2555 (diff)
downloadrails-ae7ada1fde1648a5c81b9e6adf74d515e0bbe0a5.tar.gz
rails-ae7ada1fde1648a5c81b9e6adf74d515e0bbe0a5.tar.bz2
rails-ae7ada1fde1648a5c81b9e6adf74d515e0bbe0a5.zip
Some railties cleanup:
* Rename <framework>/rails.rb -> <framework>/railtie.rb * Rails::Plugin -> Rails::Railtie * Rails::Plugin::Vendored -> Rails::Plugin
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/railtie.rb (renamed from activerecord/lib/active_record/rails.rb)4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/rails.rb b/activerecord/lib/active_record/railtie.rb
index f628c3ace0..657ee738c0 100644
--- a/activerecord/lib/active_record/rails.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -3,11 +3,11 @@
# here. This is needed for correctly setting up the middleware.
# In the future, this might become an optional require.
require "active_record"
-require "action_controller/rails"
+require "action_controller/railtie"
require "rails"
module ActiveRecord
- class Plugin < Rails::Plugin
+ class Railtie < Rails::Railtie
plugin_name :active_record
rake_tasks do