From 0787133f84dd670f662f78d615795a228fa52cdd Mon Sep 17 00:00:00 2001
From: Cathy + Qian <cnangini@gmail.com>
Date: Mon, 4 Aug 2014 16:01:00 +0300
Subject: [PATCH] Update cli to 0.0.40

---
 .jshintrc             |  2 +-
 bower.json            |  4 ++--
 config/environment.js |  4 ++++
 package.json          | 24 +++++++++++++-----------
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 604886b..7c8f894 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -29,4 +29,4 @@
   "eqnull": true,
   "esnext": true,
   "unused": true
-}
\ No newline at end of file
+}
diff --git a/bower.json b/bower.json
index 17e6d70..f1554d8 100644
--- a/bower.json
+++ b/bower.json
@@ -8,10 +8,10 @@
 
     "handlebars": "~1.3.0",
     "jquery": "^1.11.1",
-    "ember": "1.5.1",
+    "ember": "1.6.1",
     "ember-data": "1.0.0-beta.8",
     "loader": "stefanpenner/loader.js#1.0.0",
-    "ember-resolver": "~0.1.1",
+    "ember-resolver": "~0.1.5",
     "ic-ajax": "~1.x",
     "ember-easyForm": "http://builds.dockyard.com.s3.amazonaws.com/ember-easyForm/canary/ember-easyForm.min.js",
 
diff --git a/config/environment.js b/config/environment.js
index 6a0a47a..0ba9262 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -34,5 +34,9 @@ module.exports = function(environment) {
 
   }
 
+  if (environment === 'test') {
+
+  }
+
   return ENV;
 };
diff --git a/package.json b/package.json
index 73c05a8..717a1b4 100644
--- a/package.json
+++ b/package.json
@@ -18,22 +18,24 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "ember-cli": "0.0.39",
-    "originate": "0.1.5",
-    "broccoli-ember-hbs-template-compiler": "^1.5.0",
-    "loom-generators-ember-appkit": "^1.1.1",
-    "express": "^4.1.1",
+    "ast-types": "^0.3.35",
     "body-parser": "^1.2.0",
-    "glob": "^3.2.9",
-    "ember-cli-ic-ajax": "0.1.0",
-    "ember-cli-ember-data": "0.0.4",
+    "broccoli-asset-rev": "0.0.17",
+    "broccoli-ember-hbs-template-compiler": "^1.5.0",
     "broccoli-emblem-compiler": "^0.3.16",
     "broccoli-merge-trees": "^0.1.4",
     "broccoli-static-compiler": "^0.1.4",
-    "ast-types": "^0.3.35",
+    "cls": "^0.1.5",
+    "ember-cli": "0.0.40",
+    "ember-cli-ember-data": "0.1.0",
+    "ember-cli-ic-ajax": "0.1.1",
+    "express": "^4.1.1",
+    "glob": "^3.2.9",
+    "originate": "0.1.5",
     "install": "^0.1.7",
-    "source-map": "^0.1.34",
+    "loom-generators-ember-appkit": "^1.1.1",
+    "originate": "0.1.5",
     "private": "^0.1.5",
-    "cls": "^0.1.5"
+    "source-map": "^0.1.34"
   }
 }