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)5
-rw-r--r--actionpack/lib/action_view/railtie.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rails.rb b/actionpack/lib/action_controller/railtie.rb
index df708c315b..f861d12905 100644
--- a/actionpack/lib/action_controller/rails.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -1,5 +1,8 @@
+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/railtie.rb b/actionpack/lib/action_view/railtie.rb
new file mode 100644
index 0000000000..a90e0636b9
--- /dev/null
+++ b/actionpack/lib/action_view/railtie.rb
@@ -0,0 +1,2 @@
+require "action_view"
+require "rails" \ No newline at end of file