aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/route_set.rb
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-09-11 03:24:50 -0500
committerwycats <wycats@gmail.com>2010-09-11 03:24:50 -0500
commitf6153f74da29f56017d5ddb8a2b8869d9b5835d7 (patch)
tree39de2f1a37cc755ed0e0950c012b47c61427bf83 /actionpack/lib/action_dispatch/routing/route_set.rb
parent477df63433d8543ae8568de149e70d1bf1b41bb8 (diff)
parent497b6af8818f656fdbca9ed2470c1c16ae5ff1cd (diff)
downloadrails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.tar.gz
rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.tar.bz2
rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.zip
Merge remote branch 'drogus/engines'
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 956bd2e719..835ba03784 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -262,7 +262,7 @@ module ActionDispatch
module MountedHelpers
end
- def mounted_helpers(name = nil)
+ def mounted_helpers(name = :main_app)
define_mounted_helper(name) if name
MountedHelpers
end