From d12e75340996f174649ed584b062f46aa030e0dd Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Sun, 4 Nov 2012 14:59:15 +0100
Subject: backport, handle trailing slash with engines

this is a backport of #8115 to fix #7842
---
 actionpack/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'actionpack/CHANGELOG.md')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index fd9cd55bc9..fffebd87e9 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Rails 3.2.10 (unreleased) ##
 
+*   prevent double slashes in engine urls when `Rails.application.default_url_options[:trailing_slash] = true` is set
+    Fix #7842
+
+    *Yves Senn*
+
 *   Fix input name when `:multiple => true` and `:index` are set.
 
     Before:
-- 
cgit v1.2.3