aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-12-25 23:56:35 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2014-12-25 23:56:35 -0500
commit122f55ced1592f96f12ba860797910e17dcf9741 (patch)
tree25471419e3b7b2cbecc01ea5a00e204b443efcd6 /actionpack/lib/action_dispatch
parentb273c04f15e13a668003b372cc7eedd76b6409f4 (diff)
parent4761d81923fd9f5a39fb1fa051cbbad2b52c9615 (diff)
downloadrails-122f55ced1592f96f12ba860797910e17dcf9741.tar.gz
rails-122f55ced1592f96f12ba860797910e17dcf9741.tar.bz2
rails-122f55ced1592f96f12ba860797910e17dcf9741.zip
Merge pull request #18194 from claudiob/remove-action-controller-model-naming
Remove ActionController::ModelNaming
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/polymorphic_routes.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index 0847842fa2..d9bd277d62 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -1,5 +1,3 @@
-require 'action_controller/model_naming'
-
module ActionDispatch
module Routing
# Polymorphic URL helpers are methods for smart resolution to a named route call when
@@ -55,8 +53,6 @@ module ActionDispatch
# form_for([blog, @post]) # => "/blog/posts/1"
#
module PolymorphicRoutes
- include ActionController::ModelNaming
-
# Constructs a call to a named RESTful route for the given record and returns the
# resulting URL string. For example:
#