From 62fd6532e54734be5f537e247ef92b15157a83c8 Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael@koziarski.com>
Date: Fri, 19 Oct 2007 02:46:41 +0000
Subject: Remove more potential clashes with asset methods and resource routes.
  Closes #9928 [gbuesing]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7976 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack/CHANGELOG')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 76b1a530e4..cb03a628b9 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Make sure resource routes don't clash with internal helpers like javascript_path, image_path etc.  #9928 [gbuesing]
+
 * caches_page uses a single after_filter instead of one per action.  #9891 [lifofifo]
 
 * Update Prototype to 1.6.0_rc1 and script.aculo.us to 1.8.0 preview 0.  [sam, madrobby]
-- 
cgit v1.2.3