# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1462626901 -7200
# Node ID dd4ee1d4122cddee7c853f8b8ebf566afc1ccd6b
# Parent  366509ae2f37b3487d77d02e630800503f41697c
upgrade ember

diff -r 366509ae2f37 -r dd4ee1d4122c common/corpus-common-addon/lib/commands/dl-fixtures.js
--- a/common/corpus-common-addon/lib/commands/dl-fixtures.js	Sat May 07 10:06:26 2016 +0200
+++ b/common/corpus-common-addon/lib/commands/dl-fixtures.js	Sat May 07 15:15:01 2016 +0200
@@ -129,7 +129,7 @@
                 deferred.resolve();
             });
             return deferred.promise;
-        });
+        }.bind(this));
     },
     run: function(commandOptions, rawArgs) { // eslint-disable-line no-unused-vars
 
diff -r 366509ae2f37 -r dd4ee1d4122c server/bo_client/bower.json
--- a/server/bo_client/bower.json	Sat May 07 10:06:26 2016 +0200
+++ b/server/bo_client/bower.json	Sat May 07 15:15:01 2016 +0200
@@ -1,7 +1,7 @@
 {
   "name": "bo-client",
   "dependencies": {
-    "ember": "~2.5.0",
+    "ember": "~2.6.0-beta.2",
     "ember-cli-shims": "0.1.1",
     "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0",
diff -r 366509ae2f37 -r dd4ee1d4122c server/bo_client/package.json
--- a/server/bo_client/package.json	Sat May 07 10:06:26 2016 +0200
+++ b/server/bo_client/package.json	Sat May 07 15:15:01 2016 +0200
@@ -11,7 +11,7 @@
     "build": "ember build",
     "start": "ember server",
     "test": "ember test",
-    "dl-fixtures": "ember dl-fixtures -u http://127.0.0.1:8000/api/v1/documents/ -d server/fixtures/documents.js -p 2 -f require"
+    "dl-documents": "ember dl-fixtures -u http://127.0.0.1:8000/api/v1/documents/ -d server/fixtures/documents.js -p 2 -t documents -f require"
   },
   "repository": "",
   "engines": {
@@ -28,7 +28,7 @@
     "corpus-common-addon": "file:../../common/corpus-common-addon",
     "ember-ajax": "^2.0.1",
     "ember-aupac-typeahead": "2.0.7",
-    "ember-cli": "2.6.0-beta.1",
+    "ember-cli": "2.6.0-beta.2",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.6",
     "ember-cli-dependency-checker": "^1.2.0",
@@ -41,10 +41,10 @@
     "ember-cli-sass": "5.3.1",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.5.0",
+    "ember-data": "^2.6.0-beta.1",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",
-    "ember-font-awesome": "^2.1.0",
+    "ember-font-awesome": "martndemus/ember-font-awesome#pull/91/head",
     "ember-i18n": "4.2.0",
     "ember-load-initializers": "^0.5.1",
     "ember-lodash": "0.0.6",