From dfdb08f0923d22b66d6a41e7935ca3a2e02dd15a Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Thu, 19 Mar 2015 13:57:18 +0100
Subject: Merge pull request #19406 from
 larskanis/add_changelog_entry_for_17680

ActiveRecord: Add a changelog entry for issue #17680. [ci skip]
Conflicts:
	activerecord/CHANGELOG.md
---
 activerecord/CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 2bf0bba220..82d7ab353d 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -560,6 +560,13 @@
 
     *Rafael Mendonça França*
 
+*   Fix change detection problem for PostgreSQL bytea type and
+    `ArgumentError: string contains null byte` exception with pg-0.18.
+
+    Fixes #17680.
+
+    *Lars Kanis*
+
 *   When a table has a composite primary key, the `primary_key` method for
     SQLite3 and PostgreSQL adapters was only returning the first field of the key.
     Ensures that it will return nil instead, as Active Record doesn't support
-- 
cgit v1.2.3