From e5e3ec20851bb336d0efb7956d115a4b4a4bd9b1 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Sat, 30 May 2015 08:23:10 -0700
Subject: Add CHANGELOG entry for #17654 [ci skip]

---
 activerecord/CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'activerecord')

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index edbfe38753..de47660875 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,16 @@
+*   Do not set `sql_mode` if `strict: :default` is specified.
+
+        ```
+        # database.yml
+        production:
+          adapter: mysql2
+          database: foo_prod
+          user: foo
+          strict: :default
+        ```
+
+    *Ryuta Kamizono*
+
 *   SQLite: `:collation` support for string and text columns.
 
     Example:
-- 
cgit v1.2.3