From 85600ba7d4dc16c873148ef345a7f9069fe9f4ec Mon Sep 17 00:00:00 2001
From: Jacob Swanner <swanner@gmail.com>
Date: Tue, 8 Nov 2016 11:04:25 -0500
Subject: [PATCH] Improve EmberController inheritance change wording

The previous wording implies that application-wide behavior would no longer apply to `EmberCli::EmberController`, due to inheritance change. But, `EmberCli::EmberController` still inherits from `ApplicationController`, it just no longer assumes that `ApplicationController` inherits from `ActionController::Base`.
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8504150e..f76feb40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,8 +25,8 @@ master
 0.8.0
 -----
 
-* `EmberCli::EmberController` now inherits from `ActionController::Base` instead
-  of `ApplicationController`. [#400]
+* `EmberCli::EmberController` no longer assumes `ApplicationController`
+  inherits from`ActionController::Base`. [#400]
 * Remove support for Ruby 2.1.x. [#400]
 * Don't route requests to `/rails/info` through the mounted Ember application.