diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-12-04 22:26:16 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-12-04 22:26:16 +0530 |
| commit | 40e16121c05f10f9b75b6cd68c32092876142861 (patch) | |
| tree | ef029336773e706cad2442d232a184ff0db38efe /actionpack/lib/action_dispatch/routing/polymorphic_routes.rb | |
| parent | 9d3ce6c7d24fb8fe63f4bde4718e6af6225e5a98 (diff) | |
| parent | 2b847a0a9b56c7ede40012c7b3bd8ec90d6c111c (diff) | |
| download | rails-40e16121c05f10f9b75b6cd68c32092876142861.tar.gz rails-40e16121c05f10f9b75b6cd68c32092876142861.tar.bz2 rails-40e16121c05f10f9b75b6cd68c32092876142861.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/migrations.md
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/polymorphic_routes.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/polymorphic_routes.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb index 497ac3d545..6d3f8da932 100644 --- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb +++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb @@ -74,8 +74,6 @@ module ActionDispatch # * <tt>:routing_type</tt> - Allowed values are <tt>:path</tt> or <tt>:url</tt>. # Default is <tt>:url</tt>. # - # ==== Examples - # # # an Article record # polymorphic_url(record) # same as article_url(record) # |