aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-07-20 21:07:59 +0200
committerJosé Valim <jose.valim@gmail.com>2010-07-20 23:12:46 +0200
commita63566dda8246bd57e80032a1213532d0dc2ae0b (patch)
treeaeffe39e11dfc6e0bfb1dc407ab65d6ac7b04998 /actionpack/lib/action_view
parent978c49ea6a969fe040ad15dbda78e43ca5afc069 (diff)
downloadrails-a63566dda8246bd57e80032a1213532d0dc2ae0b.tar.gz
rails-a63566dda8246bd57e80032a1213532d0dc2ae0b.tar.bz2
rails-a63566dda8246bd57e80032a1213532d0dc2ae0b.zip
Moved PolymorphicRoutes to ActionDispatch::Routing
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/helpers/record_identification_helper.rb2
-rw-r--r--actionpack/lib/action_view/test_case.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/record_identification_helper.rb b/actionpack/lib/action_view/helpers/record_identification_helper.rb
index 372f1cb8aa..eea5de9bc6 100644
--- a/actionpack/lib/action_view/helpers/record_identification_helper.rb
+++ b/actionpack/lib/action_view/helpers/record_identification_helper.rb
@@ -20,4 +20,4 @@ module ActionView
end
end
end
-end \ No newline at end of file
+end
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 56aebca957..137281e5e9 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -37,7 +37,7 @@ module ActionView
include ActionController::TemplateAssertions
include ActionView::Context
- include ActionController::PolymorphicRoutes
+ include ActionDispatch::Routing::PolymorphicRoutes
include ActionController::RecordIdentifier
include AbstractController::Helpers