From 01de604d776150b9a67dec8041a4aea56829b539 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Tue, 16 Dec 2014 10:35:29 +0100
Subject: decribe deprecation cycle from `timestamps null: false` to `null:
 true`.

[ci skip]

/cc @sgrif @zzak

Conflicts:
	activerecord/CHANGELOG.md
---
 guides/source/4_2_release_notes.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/guides/source/4_2_release_notes.md b/guides/source/4_2_release_notes.md
index 1e9107a8c6..b2f77d38c4 100644
--- a/guides/source/4_2_release_notes.md
+++ b/guides/source/4_2_release_notes.md
@@ -640,6 +640,10 @@ Please refer to the [Changelog][active-record] for detailed changes.
     `Relation` for performing queries and updates is the preferred API.
     ([Commit](https://github.com/rails/rails/commit/d5902c9e))
 
+*   Deprecated `add_timestamps` and `t.timestamps` without passing the `:null`
+    option. The default of `null: true` will change in Rails 5 to `null: false`.
+    ([Pull Request](https://github.com/rails/rails/pull/16481))
+
 *   Deprecated `Reflection#source_macro` without replacement as it is no longer
     needed in Active Record.
     ([Pull Request](https://github.com/rails/rails/pull/16373))
-- 
cgit v1.2.3