From e68183cccbfbefab66c2e74855f5b30525f8e902 Mon Sep 17 00:00:00 2001
From: Nikita Fedyashev <nfedyashev@gmail.com>
Date: Fri, 28 Jun 2013 17:11:50 +0600
Subject: Omit turbolinks configuration completely on skip_javascript generator
 option

---
 railties/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 00ef1ad058..eb0545ccbf 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Omit turbolinks configuration completely on skip_javascript generator option.
+
+    *Nikita Fedyashev*
+
 *   Removed deprecated rake tasks for running tests: `rake test:uncommitted` and
     `rake test:recent`.
 
-- 
cgit v1.2.3