aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2013-02-19 02:53:02 -0800
committerXavier Noria <fxn@hashref.com>2013-02-19 02:53:02 -0800
commit7e7c9b3430cfa587e3bf97eeed009719458cf3b4 (patch)
tree4978634f4c99ec7e708f0bd33e74cfe5786f0a41 /actionpack
parent212ef5278b673aee304519d886d5db86a87b1437 (diff)
parenta66ce980e35ea49d596cd6bc57d301978a40387c (diff)
downloadrails-7e7c9b3430cfa587e3bf97eeed009719458cf3b4.tar.gz
rails-7e7c9b3430cfa587e3bf97eeed009719458cf3b4.tar.bz2
rails-7e7c9b3430cfa587e3bf97eeed009719458cf3b4.zip
Merge pull request #9321 from mfilej/action-dispatch-http-url-requires
Require ActiveSupport dependencies in ActionDispatch::Http::URL
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/http/url.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index e9ef9ee9f2..97ac462411 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -1,3 +1,6 @@
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/hash/slice'
+
module ActionDispatch
module Http
module URL