aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2010-09-27 20:57:26 -0300
committerEmilio Tagua <miloops@gmail.com>2010-09-27 20:57:26 -0300
commit197a995bc548e206bb907c40d75f8ed70fa5a923 (patch)
treecbfccffef28b604f2cf006e008e779189abed66b /actionpack/lib/action_controller.rb
parent8adb24016d76a2257b79f4566de66e1b88e56c71 (diff)
downloadrails-197a995bc548e206bb907c40d75f8ed70fa5a923.tar.gz
rails-197a995bc548e206bb907c40d75f8ed70fa5a923.tar.bz2
rails-197a995bc548e206bb907c40d75f8ed70fa5a923.zip
Move uri parser to AS as URI.parser method to reuse it in AP and ARes.
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r--actionpack/lib/action_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 787439db87..5b81cd39f4 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -8,7 +8,6 @@ module ActionController
autoload :Caching
autoload :Metal
autoload :Middleware
- autoload :UriParser
autoload_under "metal" do
autoload :Compatibility
@@ -73,4 +72,5 @@ require 'active_support/core_ext/load_error'
require 'active_support/core_ext/module/attr_internal'
require 'active_support/core_ext/module/delegation'
require 'active_support/core_ext/name_error'
+require 'active_support/core_ext/uri'
require 'active_support/inflector'