aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-02-22 15:57:15 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-02-22 15:57:49 -0800
commit93f1667e91c7fa6d2136bcd64f8c8a1231da4a7f (patch)
treeda6d84e55ef67557b31c47e976eb7dd99ad7f694 /actionpack/lib
parent4bcd437f760cfaf310fece0fe36abe55bccba42b (diff)
downloadrails-93f1667e91c7fa6d2136bcd64f8c8a1231da4a7f.tar.gz
rails-93f1667e91c7fa6d2136bcd64f8c8a1231da4a7f.tar.bz2
rails-93f1667e91c7fa6d2136bcd64f8c8a1231da4a7f.zip
Merge pull request #5084 from johndouthat/patch-1
Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 33eb7b0746..a78e1e13b0 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -267,8 +267,7 @@ module ActionDispatch
def eval_block(block)
if block.arity == 1
raise "You are using the old router DSL which has been removed in Rails 3.1. " <<
- "Please check how to update your routes file at: http://www.engineyard.com/blog/2010/the-lowdown-on-routes-in-rails-3/ " <<
- "or add the rails_legacy_mapper gem to your Gemfile"
+ "Please check how to update your routes file at: http://www.engineyard.com/blog/2010/the-lowdown-on-routes-in-rails-3/"
end
mapper = Mapper.new(self)
if default_scope