From b6f50b3fa86c272016d828d173ca57cfd41ec2c8 Mon Sep 17 00:00:00 2001
From: claudiob <claudiob@gmail.com>
Date: Wed, 31 Dec 2014 14:10:26 +0100
Subject: Add --skip-action-mailer (or -M) to rails generate

---
 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 b32e9437a3..d583be5e73 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Add `--skip-action-mailer` option to the app generator.
+
+    *claudiob*
+
 *   Autoload any second level directories called `app/*/concerns`.
 
     *Alex Robbin*
-- 
cgit v1.2.3