aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/rails.rb1
-rw-r--r--actionpack/lib/action_view/rails.rb3
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rails.rb b/actionpack/lib/action_controller/rails.rb
index d4faca2681..4d3ca43f99 100644
--- a/actionpack/lib/action_controller/rails.rb
+++ b/actionpack/lib/action_controller/rails.rb
@@ -1,4 +1,5 @@
require "action_controller"
+require "rails"
module ActionController
class Plugin < Rails::Plugin
diff --git a/actionpack/lib/action_view/rails.rb b/actionpack/lib/action_view/rails.rb
index cae39382b8..a90e0636b9 100644
--- a/actionpack/lib/action_view/rails.rb
+++ b/actionpack/lib/action_view/rails.rb
@@ -1 +1,2 @@
-require "action_view" \ No newline at end of file
+require "action_view"
+require "rails" \ No newline at end of file