aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
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:15 -0800
commit3f8dc559ecab440b394b89285e6d3579e620e6af (patch)
treef42fc4991716fe0588bedd0c9dd840bd2202a197 /actionpack
parentabf3f67e27b81cb1af54f3fca8bf8ddf1363e6ca (diff)
parent4250cca058cca4dce0bdda4fdcce2d22c1c03c28 (diff)
downloadrails-3f8dc559ecab440b394b89285e6d3579e620e6af.tar.gz
rails-3f8dc559ecab440b394b89285e6d3579e620e6af.tar.bz2
rails-3f8dc559ecab440b394b89285e6d3579e620e6af.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')
-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 6c189fdba6..b767426de4 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -251,8 +251,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