aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
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 /actionpack
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 'actionpack')
-rw-r--r--actionpack/lib/action_controller/railtie.rb (renamed from actionpack/lib/action_controller/rails.rb)2
-rw-r--r--actionpack/lib/action_view/railtie.rb (renamed from actionpack/lib/action_view/rails.rb)0
2 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rails.rb b/actionpack/lib/action_controller/railtie.rb
index 4d3ca43f99..f861d12905 100644
--- a/actionpack/lib/action_controller/rails.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -2,7 +2,7 @@ require "action_controller"
require "rails"
module ActionController
- class Plugin < Rails::Plugin
+ class Railtie < Rails::Railtie
plugin_name :action_controller
initializer "action_controller.set_configs" do |app|
diff --git a/actionpack/lib/action_view/rails.rb b/actionpack/lib/action_view/railtie.rb
index a90e0636b9..a90e0636b9 100644
--- a/actionpack/lib/action_view/rails.rb
+++ b/actionpack/lib/action_view/railtie.rb