From e817d498c66dbd68296b7c986af55ca2861fbbfd Mon Sep 17 00:00:00 2001
From: christopherthielen <github@sandgnat.com>
Date: Sun, 7 Feb 2016 10:24:12 -0600
Subject: [PATCH] prep for 0.2.18

---
 .gitignore     |  3 +++
 .npmignore     |  2 ++
 CHANGELOG.md   | 19 +++++++++++++++++++
 bower.json     |  4 ++--
 component.json |  2 +-
 package.json   |  7 +++++--
 6 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0782fba35..667c876b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ bower_components
 
 # webstorm files
 .idea
+*.iml
+*.ipr
+*.iws
diff --git a/.npmignore b/.npmignore
index 68793fbba..121f8379d 100644
--- a/.npmignore
+++ b/.npmignore
@@ -2,12 +2,14 @@
 **/.*
 
 # Build related stuff
+/build
 /config
 /lib
 /ngdoc_assets
 /sample
 /test
 /bower_components
+/node_modules
 Gruntfile.js
 files.js
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb56d561d..060b4bf28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+<a name="0.2.18"></a>
+### 0.2.18 (2016-02-07)
+
+This is a maintenance release which fixes a few known bugs introduced in 0.2.16.
+
+#### Bug Fixes
+
+* **$urlRouter:** revert BC: resolve clashing of routes This reverts commit b5c57c8ec2e14e17e75104 ([2f1ebefc](https://github.com/angular-ui/ui-router/commit/2f1ebefc242ff48960e0bf63da359296a38f6852), closes [#2501](https://github.com/angular-ui/ui-router/issues/2501))
+* **uiState:** Corrected typo for 'ref' variable (#2488, #2508) ([b8f3c144](https://github.com/angular-ui/ui-router/commit/b8f3c144b913e620f177b78f3b4f52afa61d41a6))
+* **$urlMatcherFactory:** Fix to make the YUI Javascript compressor work ([ad9c41d2](https://github.com/angular-ui/ui-router/commit/ad9c41d2e723d50e30dd3452fbd274b7057dc3d9))
+* **stateBuilder:** fix non-url params on a state without a url. The parameters are now applied when ([d6d8c332](https://github.com/angular-ui/ui-router/commit/d6d8c3322c4dde8bb5b8dde25f9fcda49e9c4c81), closes [#2025](https://github.com/angular-ui/ui-router/issues/2025))
+* **ui-view:** (ui-view) use static renderer when no animation is present for a ui-view ([2523bbdb](https://github.com/angular-ui/ui-router/commit/2523bbdb5542483a489c22804f1751b8b9f71703), closes [#2485](https://github.com/angular-ui/ui-router/issues/2485)). This allows a ui-view scope to be destroyed when switching states, before the next view is initialized.
+
+
+#### Features
+
+* **ui-view:** Add noanimation attribute to specify static renderer. ([2523bbdb](https://github.com/angular-ui/ui-router/commit/2523bbdb5542483a489c22804f1751b8b9f71703), closes [#2485](https://github.com/angular-ui/ui-router/issues/2485)). This allows a ui-view scope to be destroyed before the next ui-view is initialized, when ui-view animation is not present.
+
+
 <a name="0.2.17"></a>
 ### 0.2.17 (2016-01-25)
 
diff --git a/bower.json b/bower.json
index fb5256acd..892936f1a 100644
--- a/bower.json
+++ b/bower.json
@@ -1,10 +1,10 @@
 {
   "name": "angular-ui-router",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "license" : "MIT",
   "main": "./release/angular-ui-router.js",
   "dependencies": {
-    "angular": ">= 1.0.8"
+    "angular": "^1.0.8"
   },
   "ignore": [
     "**/.*",
diff --git a/component.json b/component.json
index b74b378cf..d55044b3e 100644
--- a/component.json
+++ b/component.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-router",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "State-based routing for AngularJS",
   "keywords": [
     "angular",
diff --git a/package.json b/package.json
index b7fbedebe..adbe3ea29 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-ui-router",
   "description": "State-based routing for AngularJS",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "homepage": "http://angular-ui.github.com/",
   "contributors": [
     {
@@ -36,13 +36,16 @@
   "bugs": {
     "url": "https://github.com/angular-ui/ui-router/issues"
   },
+  "license": "MIT",
   "licenses": [
     {
       "type": "MIT",
       "url": "https://github.com/angular-ui/ui-router/blob/master/LICENSE"
     }
   ],
-  "dependencies": {},
+  "dependencies": {
+    "angular": "^1.0.8"
+  },
   "devDependencies": {
     "faithful-exec": "~0.1.0",
     "grunt": "~0.4.1",