aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2012-12-13 20:26:18 +0000
committerAndrew White <andyw@pixeltrix.co.uk>2012-12-14 13:19:50 +0000
commita16da3f25f068119679792e4c64a7eac7bfe911a (patch)
tree147d026d791bc16e4bbdb4d923c4185dc10ec076 /actionpack
parent6bdc04624dcc0f45aab93af42d00224f67da36d5 (diff)
downloadrails-a16da3f25f068119679792e4c64a7eac7bfe911a.tar.gz
rails-a16da3f25f068119679792e4c64a7eac7bfe911a.tar.bz2
rails-a16da3f25f068119679792e4c64a7eac7bfe911a.zip
Revert "Clear url helpers when reloading routes"
This doesn't actually remove old url helper methods as they are defined in a different module. This reverts commit 96bcef947bf713b7d9fc88f26dff69f568111262. Conflicts: actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md4
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb1
2 files changed, 0 insertions, 5 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index f2f75dde36..521b9b6835 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -147,10 +147,6 @@
*Daniel Fox, Grant Hutchins & Trace Wax*
-* Clear url helpers when reloading routes.
-
- *Santiago Pastorino*
-
* `BestStandardsSupport` middleware now appends it's `X-UA-Compatible` value to app's
returned value if any. Fix #8086
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 0f95daa790..61071d1228 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -288,7 +288,6 @@ module ActionDispatch
def clear!
@finalized = false
- @url_helpers = nil
named_routes.clear
set.clear
formatter.clear