From ad9322d69fa313a32a650915d786baaebc03aab2 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias.bieniek@gmail.com>
Date: Fri, 2 Feb 2018 11:36:58 +0100
Subject: [PATCH] Release v2.18.2

---
 CHANGELOG.md | 22 ++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed0b205839..cabbfbf4fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # ember-cli Changelog
 
+## v2.18.2
+
+The following changes are required if you are upgrading from the previous
+version:
+
+- Users
+  + [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v2.18.1...v2.18.2)
+  + Upgrade your project's ember-cli version - [docs](https://ember-cli.com/user-guide/#upgrading)
+- Addon Developers
+  + [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v2.18.1...v2.18.2)
+- Core Contributors
+  + No changes required
+
+#### Community Contributions
+
+- [#7569](https://github.com/ember-cli/ember-cli/pull/7569) mark "lib" folder as node style in eslint for apps [@kellyselden](https://github.com/kellyselden)
+- [#7589](https://github.com/ember-cli/ember-cli/pull/7589) upgrade testem [@stefanpenner](https://github.com/stefanpenner)
+- [#7594](https://github.com/ember-cli/ember-cli/pull/7594) Install optional dependencies when creating a new project [@tomdale](https://github.com/tomdale)
+
+Thank you to all who took the time to contribute!
+
+
 ## v2.18.1
 
 The following changes are required if you are upgrading from the previous
diff --git a/package.json b/package.json
index fae646fe89..4159a16078 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "2.18.1",
+  "version": "2.18.2",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",