aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-03-01 13:35:24 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2015-03-01 13:35:24 -0800
commitcad20f720c4c6e04584253cd0a23f22b3d43ab0f (patch)
tree73907286156d949077e2cbb655d41d06ca7405f5
parent1d10b4bdacf02e6089d2d8f3e379890db9874d12 (diff)
downloadrails-cad20f720c4c6e04584253cd0a23f22b3d43ab0f.tar.gz
rails-cad20f720c4c6e04584253cd0a23f22b3d43ab0f.tar.bz2
rails-cad20f720c4c6e04584253cd0a23f22b3d43ab0f.zip
move _generate_paths_by_default to where it is used
_generate_paths_by_default wasn't used in AD::Routing::UrlFor, so we should be able to move it where it is used in AV::Routing
-rw-r--r--actionpack/lib/action_dispatch/routing/url_for.rb6
-rw-r--r--actionview/lib/action_view/routing_url_for.rb6
2 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index dca86858cc..eb554ec383 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -184,12 +184,6 @@ module ActionDispatch
def _routes_context
self
end
-
- private
-
- def _generate_paths_by_default
- true
- end
end
end
end
diff --git a/actionview/lib/action_view/routing_url_for.rb b/actionview/lib/action_view/routing_url_for.rb
index f281333a41..0371db07dc 100644
--- a/actionview/lib/action_view/routing_url_for.rb
+++ b/actionview/lib/action_view/routing_url_for.rb
@@ -130,5 +130,11 @@ module ActionView
controller.optimize_routes_generation? : super
end
protected :optimize_routes_generation?
+
+ private
+
+ def _generate_paths_by_default
+ true
+ end
end
end