Merge pull request rails#5084 from johndouthat/patch-1

Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
pinetops · Feb 22, 2012 · fadad9f · fadad9f
1 parent 82d6ded
commit fadad9f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -267,8 +267,7 @@ def prepend(&block)
       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/ " <<
+            "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"
         end
         mapper = Mapper.new(self)
         if default_scope