aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2013-09-19 05:08:27 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2013-09-19 05:08:27 -0700
commitfb2785ec3d97f0e3578e181012f18eda920dca10 (patch)
tree5e3b3a5bf0efed2a268541be28f2b8461c4ad2e5 /actionpack/lib
parentcb8174c57f46f3b11bc4662638539f45677d7dc1 (diff)
parentf76340e42b56dc09b42c2e9c209bb5c5d6869fac (diff)
downloadrails-fb2785ec3d97f0e3578e181012f18eda920dca10.tar.gz
rails-fb2785ec3d97f0e3578e181012f18eda920dca10.tar.bz2
rails-fb2785ec3d97f0e3578e181012f18eda920dca10.zip
Merge pull request #12280 from kennyj/remove_1_8_compat
Remove 1.8 compatible code
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/journey/router/utils.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/journey/router/utils.rb b/actionpack/lib/action_dispatch/journey/router/utils.rb
index 80011597aa..810f86db2f 100644
--- a/actionpack/lib/action_dispatch/journey/router/utils.rb
+++ b/actionpack/lib/action_dispatch/journey/router/utils.rb
@@ -36,7 +36,7 @@ module ActionDispatch
UNSAFE_FRAGMENT = Regexp.new("[^#{safe_fragment}]", false).freeze
end
- Parser = URI.const_defined?(:Parser) ? URI::Parser.new : URI
+ Parser = URI::Parser.new
def self.escape_path(path)
Parser.escape(path.to_s, UriEscape::UNSAFE_SEGMENT)