aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-12-31 12:28:48 -0800
committerCarl Lerche <carllerche@mac.com>2009-12-31 13:12:52 -0800
commite749424dfa38a0300a621b772eae96f9cc5d2555 (patch)
tree17300967fe0c5bbd245ddceeb3682b5781a436f1 /actionpack
parentfdc62cdcdb70e13f2cf9e6dced35016716d889f9 (diff)
downloadrails-e749424dfa38a0300a621b772eae96f9cc5d2555.tar.gz
rails-e749424dfa38a0300a621b772eae96f9cc5d2555.tar.bz2
rails-e749424dfa38a0300a621b772eae96f9cc5d2555.zip
Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rb
Diffstat (limited to 'actionpack')
-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