From f2f72ccc403cb440ed5f4d0ada64252b49151ad2 Mon Sep 17 00:00:00 2001
From: Tobie Morgan Hitchcock <tobie@abcum.com>
Date: Sat, 1 Oct 2016 17:00:40 +0100
Subject: [PATCH] Upgrade to ember-cli@2.8.0

---
 gui/.travis.yml           | 2 +-
 gui/Makefile              | 5 ++---
 gui/bower.json            | 5 ++---
 gui/config/environment.js | 3 +--
 gui/package.json          | 6 +++---
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/gui/.travis.yml b/gui/.travis.yml
index e072a03c..ac9eaa18 100644
--- a/gui/.travis.yml
+++ b/gui/.travis.yml
@@ -14,7 +14,7 @@ before_install:
   - npm install -g bower
   - bower --version
   - npm install phantomjs-prebuilt
-  - phantomjs --version
+  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
 
 install:
   - npm install
diff --git a/gui/Makefile b/gui/Makefile
index 7d67384b..171db3c8 100644
--- a/gui/Makefile
+++ b/gui/Makefile
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 GO ?= go
-LDF :=
 
 # The `make default` command cleans
 # the go build and test files and
@@ -32,7 +31,7 @@ default:
 setup:
 	@echo "Setup..."
 	npm install -g bower
-	npm install -g ember-cli@2.7.0
+	npm install -g ember-cli@2.8.0
 
 # The `make install` command installs
 # the 3rd party dependencies needed
@@ -54,6 +53,6 @@ upgrade:
 	@echo "Upgrading..."
 	npm cache clean && bower cache clean
 	rm -rf node_modules bower_components dist tmp
-	npm install --save-dev ember-cli@2.7.0
+	npm install --save-dev ember-cli@2.8.0
 	npm install && bower install
 	ember init
diff --git a/gui/bower.json b/gui/bower.json
index 0b96caa1..91605460 100644
--- a/gui/bower.json
+++ b/gui/bower.json
@@ -1,8 +1,7 @@
 {
   "name": "gui",
   "dependencies": {
-    "ember": "~2.7.0",
-    "ember-cli-shims": "0.1.1",
-    "ember-qunit-notifications": "0.1.0"
+    "ember": "~2.8.0",
+    "ember-cli-shims": "0.1.1"
   }
 }
diff --git a/gui/config/environment.js b/gui/config/environment.js
index 1d0fb308..eb5e6e93 100644
--- a/gui/config/environment.js
+++ b/gui/config/environment.js
@@ -4,7 +4,7 @@ module.exports = function(environment) {
   var ENV = {
     modulePrefix: 'gui',
     environment: environment,
-    baseURL: '/',
+    rootURL: '/',
     locationType: 'auto',
     EmberENV: {
       FEATURES: {
@@ -29,7 +29,6 @@ module.exports = function(environment) {
 
   if (environment === 'test') {
     // Testem prefers this...
-    ENV.baseURL = '/';
     ENV.locationType = 'none';
 
     // keep test console output quieter
diff --git a/gui/package.json b/gui/package.json
index fadbc301..3e425a85 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.2",
     "ember-ajax": "^2.0.1",
-    "ember-cli": "2.7.0",
+    "ember-cli": "2.8.0",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.6",
     "ember-cli-dependency-checker": "^1.2.0",
@@ -29,12 +29,12 @@
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.4.0",
     "ember-cli-jshint": "^1.0.0",
-    "ember-cli-qunit": "^2.0.0",
+    "ember-cli-qunit": "^2.1.0",
     "ember-cli-release": "^0.2.9",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.7.0",
+    "ember-data": "^2.8.0",
     "ember-export-application-global": "^1.0.5",
     "ember-load-initializers": "^0.5.1",
     "ember-resolver": "^2.0.3",