aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-07-28 11:24:08 -0700
committerJosé Valim <jose.valim@gmail.com>2011-07-28 11:24:08 -0700
commitcaacf85673b880d22d23443e32c24234e3b2f347 (patch)
tree477165322b73ebcdffbee1edae1283870f02ddd5 /actionpack/lib
parentb295ea1362bdd5033cfb5602985c0c11f37e2ae0 (diff)
parentad0772f2683792a656d084ce676775f272158801 (diff)
downloadrails-caacf85673b880d22d23443e32c24234e3b2f347.tar.gz
rails-caacf85673b880d22d23443e32c24234e3b2f347.tar.bz2
rails-caacf85673b880d22d23443e32c24234e3b2f347.zip
Merge pull request #2327 from cesario/patch-1
We don't need to require erb here.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index bd04f48c00..a5c1501f61 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1,4 +1,3 @@
-require 'erb'
require 'active_support/core_ext/hash/except'
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/object/inclusion'