From 84010f63c40e35b10d93d121c4fee01f65016988 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 17 Feb 2015 13:35:58 +0100
Subject: [PATCH] Update Ember.js to 1.10

---
 Brocfile.js  | 7 ++++++-
 bower.json   | 2 +-
 package.json | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Brocfile.js b/Brocfile.js
index 16bcd676..89133ebc 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -21,7 +21,12 @@ if (process.env.DISABLE_FINGERPRINTS) {
 }
 
 var app = new EmberApp({
-  fingerprint: fingerprint
+  fingerprint: fingerprint,
+  vendorFiles: {
+    // next line is needed to prevent ember-cli to load
+    // handlebars (it happens automatically in 0.1.x)
+    'handlebars.js': null
+  }
 });
 
 app.import('bower_components/pusher/dist/pusher.js');
diff --git a/bower.json b/bower.json
index 41e6caee..8e2933a2 100644
--- a/bower.json
+++ b/bower.json
@@ -3,7 +3,7 @@
   "dependencies": {
     "handlebars": "2.0.0",
     "jquery": "^1.11.1",
-    "ember": "1.9.1",
+    "ember": "1.10.0",
     "ember-data": "1.0.0-beta.14",
     "ember-resolver": "~0.1.11",
     "loader.js": "ember-cli/loader.js#1.0.1",
diff --git a/package.json b/package.json
index ee197165..5541d5cc 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "ember-cli-content-security-policy": "0.3.0",
     "ember-cli-dependency-checker": "0.0.7",
     "ember-cli-document-title": "0.0.1",
-    "ember-cli-htmlbars": "^0.6.0",
+    "ember-cli-htmlbars": "^0.7.0",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-inline-images": "^0.0.4",