diff options
author | Piotr Sarnacki <drogus@gmail.com> | 2010-08-05 15:44:23 +0200 |
---|---|---|
committer | Piotr Sarnacki <drogus@gmail.com> | 2010-09-05 13:44:36 +0200 |
commit | b3eb26a161acb23781e55fc6c37b948f160cd9b5 (patch) | |
tree | 3c8e43a17dc5fe06eb3b4552d04d479863161fb5 /actionpack/lib/action_dispatch/routing/mapper.rb | |
parent | 91fec0d24d50d3b3e90c48b2501ca913544781cc (diff) | |
download | rails-b3eb26a161acb23781e55fc6c37b948f160cd9b5.tar.gz rails-b3eb26a161acb23781e55fc6c37b948f160cd9b5.tar.bz2 rails-b3eb26a161acb23781e55fc6c37b948f160cd9b5.zip |
Removed deprecated RouteSet API, still many tests fail
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 900900ee24..cee3fd880c 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -443,11 +443,6 @@ module ActionDispatch options = args.extract_options! options = options.dup - if name_prefix = options.delete(:name_prefix) - options[:as] ||= name_prefix - ActiveSupport::Deprecation.warn ":name_prefix was deprecated in the new router syntax. Use :as instead.", caller - end - options[:path] = args.first if args.first.is_a?(String) recover = {} @@ -770,7 +765,7 @@ module ActionDispatch end resource_scope(Resource.new(resources.pop, options)) do - yield if block_given? + instance_eval(&block) if block_given? collection_scope do get :index if parent_resource.actions.include?(:index) |