diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-22 15:57:15 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-22 15:57:43 -0800 |
commit | fadad9fcef1a0cd5dac4eb1bb290b94b8e6eaac0 (patch) | |
tree | 812880742e2b6c9d0d1dfaf1b6279b0e127f2f31 /actionpack/lib | |
parent | 82d6dedc7acb98c7c7671d34e47ea95c739fd356 (diff) | |
download | rails-fadad9fcef1a0cd5dac4eb1bb290b94b8e6eaac0.tar.gz rails-fadad9fcef1a0cd5dac4eb1bb290b94b8e6eaac0.tar.bz2 rails-fadad9fcef1a0cd5dac4eb1bb290b94b8e6eaac0.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.rb | 3 |
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 |