aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2010-09-28 07:57:26 +0800
committerJosé Valim <jose.valim@gmail.com>2010-09-28 11:38:35 +0800
commit71acc2737aa346ee57f9fc21252a508ae83367a4 (patch)
treeddb12b7813d20b4003c874604620d0aef7ace31a /actionpack/lib/action_controller.rb
parentb7934afe326f8bba9cdcacdfac93062dff155efe (diff)
downloadrails-71acc2737aa346ee57f9fc21252a508ae83367a4.tar.gz
rails-71acc2737aa346ee57f9fc21252a508ae83367a4.tar.bz2
rails-71acc2737aa346ee57f9fc21252a508ae83367a4.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'