aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
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