From e482a9927f05a9beaa2a90202ed486e1a9e18803 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 11 Dec 2017 14:42:17 -0800
Subject: [PATCH 01/48] Never fetch a job with null as the namespace

---
 ui/app/routes/jobs/job.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/routes/jobs/job.js b/ui/app/routes/jobs/job.js
index 4317a1e35..fa40f07bd 100644
--- a/ui/app/routes/jobs/job.js
+++ b/ui/app/routes/jobs/job.js
@@ -13,7 +13,7 @@ export default Route.extend({
   model(params, transition) {
     const namespace = transition.queryParams.namespace || this.get('system.activeNamespace.id');
     const name = params.job_name;
-    const fullId = JSON.stringify([name, namespace]);
+    const fullId = JSON.stringify([name, namespace || 'default']);
     return this.get('store')
       .findRecord('job', fullId, { reload: true })
       .then(job => {

From 534376ac62f7a99aace73c63577f55f3f8ba032a Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 11 Dec 2017 16:19:49 -0800
Subject: [PATCH 02/48] Don't dot twice after an @each

---
 ui/app/components/job-deployments-stream.js | 4 ++--
 ui/app/models/deployment.js                 | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/app/components/job-deployments-stream.js b/ui/app/components/job-deployments-stream.js
index 95bd4f198..65b700491 100644
--- a/ui/app/components/job-deployments-stream.js
+++ b/ui/app/components/job-deployments-stream.js
@@ -9,9 +9,9 @@ export default Component.extend({
 
   deployments: computed(() => []),
 
-  sortedDeployments: computed('deployments.@each.version.submitTime', function() {
+  sortedDeployments: computed('deployments.@each.versionSubmitTime', function() {
     return this.get('deployments')
-      .sortBy('version.submitTime')
+      .sortBy('versionSubmitTime')
       .reverse();
   }),
 
diff --git a/ui/app/models/deployment.js b/ui/app/models/deployment.js
index 2a952afb7..8f4440ba2 100644
--- a/ui/app/models/deployment.js
+++ b/ui/app/models/deployment.js
@@ -34,6 +34,9 @@ export default Model.extend({
     return (this.get('job.versions') || []).findBy('number', this.get('versionNumber'));
   }),
 
+  // Dependent keys can only go one level past an @each so an alias is needed
+  versionSubmitTime: computed.alias('version.submitTime'),
+
   placedCanaries: sumAggregation('taskGroupSummaries', 'placedCanaries'),
   desiredCanaries: sumAggregation('taskGroupSummaries', 'desiredCanaries'),
   desiredTotal: sumAggregation('taskGroupSummaries', 'desiredTotal'),

From fbdf3ed3cb80a2dd37aee56d87a7d52c5cf29edb Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 11 Dec 2017 16:20:13 -0800
Subject: [PATCH 03/48] Don't warn intentional errors in tests

It's too noisy
---
 ui/app/controllers/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/controllers/application.js b/ui/app/controllers/application.js
index ee8bee9ee..faa744e96 100644
--- a/ui/app/controllers/application.js
+++ b/ui/app/controllers/application.js
@@ -33,7 +33,7 @@ export default Controller.extend({
       run.next(() => {
         throw this.get('error');
       });
-    } else {
+    } else if (!Ember.testing) {
       run.next(() => {
         // eslint-disable-next-line
         console.warn('UNRECOVERABLE ERROR:', this.get('error'));

From d53849d2a5d5152cd75302b299fcc8daa98681d8 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 11 Dec 2017 16:20:38 -0800
Subject: [PATCH 04/48] Disambiguate what to do with the child task for the
 task logger

linked tasks are killed when the parent task is killed.
---
 ui/app/utils/classes/poll-logger.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/app/utils/classes/poll-logger.js b/ui/app/utils/classes/poll-logger.js
index 3077e80a0..5310f3e45 100644
--- a/ui/app/utils/classes/poll-logger.js
+++ b/ui/app/utils/classes/poll-logger.js
@@ -8,7 +8,9 @@ export default EmberObject.extend(AbstractLogger, {
   interval: 1000,
 
   start() {
-    return this.get('poll').perform();
+    return this.get('poll')
+      .linked()
+      .perform();
   },
 
   stop() {

From cbf883a9a664eceb9d6d13bec842decdeb9ef13b Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 11 Dec 2017 17:48:02 -0800
Subject: [PATCH 05/48] Upgrade to ember-cli 2.17 and ember 2.17

---
 ui/package.json |   4 +-
 ui/yarn.lock    | 450 ++++++++++++++++++++----------------------------
 2 files changed, 190 insertions(+), 264 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index d56b7749b..dd49aa5f1 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -34,7 +34,7 @@
     "d3-transition": "^1.1.0",
     "ember-ajax": "^3.0.0",
     "ember-browserify": "^1.1.13",
-    "ember-cli": "2.13.2",
+    "ember-cli": "2.17.1",
     "ember-cli-babel": "^6.0.0",
     "ember-cli-bourbon": "2.0.0-beta.1",
     "ember-cli-dependency-checker": "^1.3.0",
@@ -65,7 +65,7 @@
     "ember-power-select": "^1.9.9",
     "ember-resolver": "^4.0.0",
     "ember-sinon": "^0.7.0",
-    "ember-source": "~2.14.0",
+    "ember-source": "~2.17.0",
     "ember-truth-helpers": "^1.3.0",
     "ember-welcome-page": "^3.0.0",
     "eslint": "^4.0.0",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 62c3cdee1..de9eb1405 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -2,86 +2,16 @@
 # yarn lockfile v1
 
 
-"@glimmer/compiler@^0.22.3":
-  version "0.22.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.22.3.tgz#3aef9448460af1d320a82423323498a6ff38a0c6"
-  dependencies:
-    "@glimmer/syntax" "^0.22.3"
-    "@glimmer/util" "^0.22.3"
-    "@glimmer/wire-format" "^0.22.3"
-    simple-html-tokenizer "^0.3.0"
-
 "@glimmer/di@^0.2.0":
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e"
 
-"@glimmer/interfaces@^0.22.3":
-  version "0.22.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.22.3.tgz#1c2e3289ae41a750f0c8ddcc64529b9e90dda604"
-  dependencies:
-    "@glimmer/wire-format" "^0.22.3"
-
-"@glimmer/node@^0.22.3":
-  version "0.22.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.22.3.tgz#ff33eea6e65147a20c1bd1f05fdc4a6c3595c54c"
-  dependencies:
-    "@glimmer/runtime" "^0.22.3"
-    simple-dom "^0.3.0"
-
-"@glimmer/object-reference@^0.22.3":
-  version "0.22.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/object-reference/-/object-reference-0.22.3.tgz#31db68c8912324c63509b1ef83213f7ad4ef312b"
-  dependencies:
-    "@glimmer/reference" "^0.22.3"
-    "@glimmer/util" "^0.22.3"
-
-"@glimmer/object@^0.22.3":
-  version "0.22.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/object/-/object-0.22.3.tgz#1fc9fd7465c7d12e5b92464ad40038b595de8ed0"
-  dependencies:
-    "@glimmer/object-reference" "^0.22.3"
-    "@glimmer/util" "^0.22.3"
-
-"@glimmer/reference@^0.22.3":
-  version "0.22.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.22.3.tgz#6f2ef8cd97fe756d89fef75f8c3c79003502a2a9"
-  dependencies:
-    "@glimmer/util" "^0.22.3"
-
 "@glimmer/resolver@^0.4.1":
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/@glimmer/resolver/-/resolver-0.4.1.tgz#cd9644572c556e7e799de1cf8eff2b999cf5b878"
   dependencies:
     "@glimmer/di" "^0.2.0"
 
-"@glimmer/runtime@^0.22.3":
-  version "0.22.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.22.3.tgz#b8cb28efc9cc86c406ee996f5c2cf6730620d404"
-  dependencies:
-    "@glimmer/interfaces" "^0.22.3"
-    "@glimmer/object" "^0.22.3"
-    "@glimmer/object-reference" "^0.22.3"
-    "@glimmer/reference" "^0.22.3"
-    "@glimmer/util" "^0.22.3"
-    "@glimmer/wire-format" "^0.22.3"
-
-"@glimmer/syntax@^0.22.3":
-  version "0.22.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.22.3.tgz#8528d19324bf7f920f5cfd31925e452e51781b44"
-  dependencies:
-    handlebars "^4.0.6"
-    simple-html-tokenizer "^0.3.0"
-
-"@glimmer/util@^0.22.3":
-  version "0.22.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.22.3.tgz#8272f50905d1bb904ee371e8ade83fd779b51508"
-
-"@glimmer/wire-format@^0.22.3":
-  version "0.22.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.22.3.tgz#19b226d9b93ba6ee54472d9ffb1d48e7c0d80a0d"
-  dependencies:
-    "@glimmer/util" "^0.22.3"
-
 JSONStream@^1.0.3:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
@@ -163,18 +93,18 @@ alter@~0.2.0:
   dependencies:
     stable "~0.1.3"
 
-amd-name-resolver@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.6.tgz#d3e4ba2dfcaab1d820c1be9de947c67828cfe595"
-  dependencies:
-    ensure-posix-path "^1.0.1"
-
 amd-name-resolver@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.7.tgz#814301adfe8a2f109f6e84d5e935196efb669615"
   dependencies:
     ensure-posix-path "^1.0.1"
 
+amd-name-resolver@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.0.0.tgz#0e593b28d6fa3326ab1798107edaea961046e8d8"
+  dependencies:
+    ensure-posix-path "^1.0.1"
+
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -203,11 +133,11 @@ ansi-styles@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
 
-ansi-styles@^2.1.0, ansi-styles@^2.2.1:
+ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.1.0:
+ansi-styles@^3.0.0, ansi-styles@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
   dependencies:
@@ -245,7 +175,7 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
-argparse@^1.0.7, argparse@~1.0.2:
+argparse@^1.0.7:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
   dependencies:
@@ -1217,9 +1147,9 @@ broccoli-brocfile-loader@^0.18.0:
   dependencies:
     findup-sync "^0.4.2"
 
-broccoli-builder@^0.18.3:
-  version "0.18.8"
-  resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.8.tgz#fe54694d544c3cdfdb01028e802eeca65749a879"
+broccoli-builder@^0.18.8:
+  version "0.18.10"
+  resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.10.tgz#9767e0061ff5b5e6eb1619d1a972ef2c7fd07631"
   dependencies:
     heimdalljs "^0.2.0"
     promise-map-series "^0.2.1"
@@ -1303,6 +1233,17 @@ broccoli-debug@^0.6.1, broccoli-debug@^0.6.2:
     symlink-or-copy "^1.1.8"
     tree-sync "^1.2.2"
 
+broccoli-debug@^0.6.3:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.4.tgz#986eb3d2005e00e3bb91f9d0a10ab137210cd150"
+  dependencies:
+    broccoli-plugin "^1.2.1"
+    fs-tree-diff "^0.5.2"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    symlink-or-copy "^1.1.8"
+    tree-sync "^1.2.2"
+
 broccoli-file-creator@^1.0.0, broccoli-file-creator@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-1.1.1.tgz#1b35b67d215abdfadd8d49eeb69493c39e6c3450"
@@ -1354,7 +1295,7 @@ broccoli-funnel-reducer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
 
-broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli-funnel@^1.0.6, broccoli-funnel@^1.1.0, broccoli-funnel@^1.2.0:
+broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli-funnel@^1.1.0, broccoli-funnel@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
   dependencies:
@@ -1373,6 +1314,24 @@ broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
+broccoli-funnel@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.1.tgz#6823c73b675ef78fffa7ab800f083e768b51d449"
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^1.3.0"
+    debug "^2.2.0"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^0.5.3"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    mkdirp "^0.5.0"
+    path-posix "^1.0.0"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^0.3.1"
+
 broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@^0.2.6, broccoli-kitchen-sink-helpers@~0.2.0, broccoli-kitchen-sink-helpers@~0.2.4:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
@@ -1419,7 +1378,7 @@ broccoli-merge-trees@^2.0.0:
     broccoli-plugin "^1.3.0"
     merge-trees "^1.0.1"
 
-broccoli-middleware@^1.0.0-beta.8:
+broccoli-middleware@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-1.0.0.tgz#92f4e1fb9a791ea986245a7077f35cc648dab097"
   dependencies:
@@ -1805,12 +1764,12 @@ capture-exit@^1.1.0:
   dependencies:
     rsvp "^3.3.3"
 
-cardinal@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-0.5.0.tgz#00d5f661dbd4aabfdf7d41ce48a5a59bca35a291"
+cardinal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
   dependencies:
     ansicolors "~0.2.1"
-    redeyed "~0.5.0"
+    redeyed "~1.0.0"
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -1851,6 +1810,14 @@ chalk@^2.0.0, chalk@^2.1.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
+chalk@^2.0.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
 charm@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
@@ -1928,6 +1895,10 @@ cli-spinners@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
 
+cli-spinners@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06"
+
 cli-table2@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/cli-table2/-/cli-table2-0.2.0.tgz#2d1ef7f218a0e786e214540562d4bd177fe32d97"
@@ -2126,13 +2097,13 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
-console-ui@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-1.0.3.tgz#31c524461b63422769f9e89c173495d91393721c"
+console-ui@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-2.0.1.tgz#56d0721ebcc44e6c9c3de02f355f898aba41ea79"
   dependencies:
-    chalk "^1.1.3"
-    inquirer "^1.2.3"
-    ora "^0.2.0"
+    chalk "^2.1.0"
+    inquirer "^2"
+    ora "^1.3.0"
     through "^2.3.8"
 
 consolidate@^0.14.0:
@@ -2189,7 +2160,7 @@ core-object@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/core-object/-/core-object-1.1.0.tgz#86d63918733cf9da1a5aae729e62c0a88e66ad0a"
 
-core-object@^3.0.0:
+core-object@^3.1.3:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9"
   dependencies:
@@ -2335,6 +2306,10 @@ d@1:
   dependencies:
     es5-ext "^0.10.9"
 
+dag-map@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dag-map/-/dag-map-2.0.2.tgz#9714b472de82a1843de2fba9b6876938cab44c68"
+
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -2743,10 +2718,14 @@ ember-cli-legacy-blueprints@^0.1.2:
     rsvp "^3.0.17"
     silent-error "^1.0.0"
 
-ember-cli-lodash-subset@^1.0.11, ember-cli-lodash-subset@^1.0.7:
+ember-cli-lodash-subset@^1.0.7:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz#af2e77eba5dcb0d77f3308d3a6fd7d3450f6e537"
 
+ember-cli-lodash-subset@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
+
 ember-cli-mirage@^0.3.3:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.3.4.tgz#eeb9d6e02c0c49c81915762178bab9a42d86ada8"
@@ -2924,53 +2903,53 @@ ember-cli-version-checker@^2.1.0:
     resolve "^1.3.3"
     semver "^5.3.0"
 
-ember-cli@2.13.2:
-  version "2.13.2"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.13.2.tgz#a561f08e69b184fa3175f706cced299c0d1684e5"
+ember-cli@2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.17.1.tgz#915a140732cd28d6c3d5b2e890731864ea55ad5b"
   dependencies:
-    amd-name-resolver "0.0.6"
+    amd-name-resolver "1.0.0"
     babel-plugin-transform-es2015-modules-amd "^6.24.0"
     bower-config "^1.3.0"
     bower-endpoint-parser "0.2.2"
     broccoli-babel-transpiler "^6.0.0"
     broccoli-brocfile-loader "^0.18.0"
-    broccoli-builder "^0.18.3"
+    broccoli-builder "^0.18.8"
     broccoli-concat "^3.2.2"
     broccoli-config-loader "^1.0.0"
     broccoli-config-replace "^1.1.2"
-    broccoli-funnel "^1.0.6"
+    broccoli-debug "^0.6.3"
+    broccoli-funnel "^2.0.0"
     broccoli-funnel-reducer "^1.0.0"
     broccoli-merge-trees "^2.0.0"
-    broccoli-middleware "^1.0.0-beta.8"
+    broccoli-middleware "^1.0.0"
     broccoli-source "^1.1.0"
     broccoli-stew "^1.2.0"
     calculate-cache-key-for-tree "^1.0.0"
     capture-exit "^1.1.0"
-    chalk "^1.1.3"
+    chalk "^2.0.1"
     clean-base-url "^1.0.0"
     compression "^1.4.4"
     configstore "^3.0.0"
-    console-ui "^1.0.2"
-    core-object "^3.0.0"
+    console-ui "^2.0.0"
+    core-object "^3.1.3"
+    dag-map "^2.0.2"
     diff "^3.2.0"
     ember-cli-broccoli-sane-watcher "^2.0.4"
-    ember-cli-get-component-path-option "^1.0.0"
     ember-cli-is-package-missing "^1.0.0"
     ember-cli-legacy-blueprints "^0.1.2"
-    ember-cli-lodash-subset "^1.0.11"
+    ember-cli-lodash-subset "^2.0.1"
     ember-cli-normalize-entity-name "^1.0.0"
     ember-cli-preprocess-registry "^3.1.0"
     ember-cli-string-utils "^1.0.0"
-    ember-try "^0.2.14"
+    ember-try "^0.2.15"
     ensure-posix-path "^1.0.2"
-    escape-string-regexp "^1.0.3"
-    execa "^0.6.0"
+    execa "^0.8.0"
     exists-sync "0.0.4"
     exit "^0.1.2"
     express "^4.12.3"
     filesize "^3.1.3"
     find-up "^2.1.0"
-    fs-extra "2.0.0"
+    fs-extra "^4.0.0"
     fs-tree-diff "^0.5.2"
     get-caller-file "^1.0.0"
     git-repo-info "^1.4.1"
@@ -2981,14 +2960,14 @@ ember-cli@2.13.2:
     heimdalljs-logger "^0.1.7"
     http-proxy "^1.9.0"
     inflection "^1.7.0"
-    is-git-url "^0.2.0"
+    is-git-url "^1.0.0"
     isbinaryfile "^3.0.0"
     js-yaml "^3.6.1"
     json-stable-stringify "^1.0.1"
     leek "0.0.24"
     lodash.template "^4.2.5"
     markdown-it "^8.3.0"
-    markdown-it-terminal "0.0.4"
+    markdown-it-terminal "0.1.0"
     minimatch "^3.0.0"
     morgan "^1.8.1"
     node-modules-path "^1.0.0"
@@ -2998,14 +2977,14 @@ ember-cli@2.13.2:
     promise-map-series "^0.2.1"
     quick-temp "^0.1.8"
     resolve "^1.3.0"
-    rsvp "^3.3.3"
+    rsvp "^4.7.0"
     sane "^1.6.0"
     semver "^5.1.1"
     silent-error "^1.0.0"
     sort-package-json "^1.4.0"
     symlink-or-copy "^1.1.8"
     temp "0.8.3"
-    testem "^1.15.0"
+    testem "^1.18.0"
     tiny-lr "^1.0.3"
     tree-sync "^1.2.1"
     uuid "^3.0.0"
@@ -3261,7 +3240,7 @@ ember-rfc176-data@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.1.tgz#6a5a4b8b82ec3af34f3010965fa96b936ca94519"
 
-ember-router-generator@^1.0.0:
+ember-router-generator@^1.0.0, ember-router-generator@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-1.2.3.tgz#8ed2ca86ff323363120fc14278191e9e8f1315ee"
   dependencies:
@@ -3283,30 +3262,25 @@ ember-sinon@^0.7.0:
     ember-cli-babel "^5.1.7"
     sinon "^2.1.0"
 
-ember-source@~2.14.0:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.14.1.tgz#4abf0b4c916f2da8bf317349df4750905df7e628"
+ember-source@~2.17.0:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.17.0.tgz#b78871dd49bd8d642b80176df4faf7fd7d059dac"
   dependencies:
-    "@glimmer/compiler" "^0.22.3"
-    "@glimmer/node" "^0.22.3"
-    "@glimmer/reference" "^0.22.3"
-    "@glimmer/runtime" "^0.22.3"
-    "@glimmer/util" "^0.22.3"
     broccoli-funnel "^1.2.0"
     broccoli-merge-trees "^2.0.0"
     ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
     ember-cli-normalize-entity-name "^1.0.0"
     ember-cli-path-utils "^1.0.0"
     ember-cli-string-utils "^1.1.0"
     ember-cli-test-info "^1.0.0"
     ember-cli-valid-component-name "^1.0.0"
-    ember-cli-version-checker "^1.3.1"
-    handlebars "^4.0.6"
+    ember-cli-version-checker "^2.1.0"
+    ember-router-generator "^1.2.3"
+    fs-extra "^4.0.1"
+    inflection "^1.12.0"
     jquery "^3.2.1"
     resolve "^1.3.3"
-    rsvp "^3.5.0"
-    simple-dom "^0.3.0"
-    simple-html-tokenizer "^0.4.1"
 
 ember-test-helpers@^0.6.3:
   version "0.6.3"
@@ -3324,25 +3298,24 @@ ember-truth-helpers@^1.3.0:
   dependencies:
     ember-cli-babel "^5.1.6"
 
-ember-try-config@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-2.1.0.tgz#e0e156229a542346a58ee6f6ad605104c98edfe0"
+ember-try-config@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-2.2.0.tgz#6be0af6c71949813e02ac793564fddbf8336b807"
   dependencies:
     lodash "^4.6.1"
     node-fetch "^1.3.3"
     rsvp "^3.2.1"
     semver "^5.1.0"
 
-ember-try@^0.2.14:
-  version "0.2.16"
-  resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-0.2.16.tgz#cf7092d8a8fea9701d7faa73cbdbff37a8ada330"
+ember-try@^0.2.15:
+  version "0.2.22"
+  resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-0.2.22.tgz#3989e9c013c1d5c209ec97f5dfcf4234e594d5e2"
   dependencies:
     chalk "^1.0.0"
     cli-table2 "^0.2.0"
     core-object "^1.1.0"
     debug "^2.2.0"
-    ember-cli-version-checker "^1.1.6"
-    ember-try-config "^2.0.1"
+    ember-try-config "^2.2.0"
     extend "^3.0.0"
     fs-extra "^0.26.0"
     promise-map-series "^0.2.1"
@@ -3502,7 +3475,7 @@ escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
-escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
@@ -3611,10 +3584,6 @@ espree@^3.4.0, espree@^3.5.0:
     acorn "^5.1.1"
     acorn-jsx "^3.0.0"
 
-esprima-fb@~12001.1.0-dev-harmony-fb:
-  version "12001.1.0-dev-harmony-fb"
-  resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz#d84400384ba95ce2678c617ad24a7f40808da915"
-
 esprima-fb@~15001.1001.0-dev-harmony-fb:
   version "15001.1001.0-dev-harmony-fb"
   resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz#43beb57ec26e8cf237d3dd8b33e42533577f2659"
@@ -3627,6 +3596,10 @@ esprima@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
+esprima@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
+
 esprima@~3.1.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
@@ -3688,9 +3661,9 @@ exec-sh@^0.2.0:
   dependencies:
     merge "^1.1.3"
 
-execa@^0.6.0:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.3.tgz#57b69a594f081759c69e5370f0d17b9cb11658fe"
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -3700,9 +3673,9 @@ execa@^0.6.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+execa@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -4006,13 +3979,6 @@ fs-exists-sync@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
 
-fs-extra@2.0.0, fs-extra@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-
 fs-extra@^0.24.0:
   version "0.24.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
@@ -4050,6 +4016,21 @@ fs-extra@^1.0.0:
     jsonfile "^2.1.0"
     klaw "^1.0.0"
 
+fs-extra@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+
+fs-extra@^4.0.0, fs-extra@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-readdir-recursive@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059"
@@ -4257,7 +4238,7 @@ growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
 
-handlebars@^4.0.4, handlebars@^4.0.6:
+handlebars@^4.0.4:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
   dependencies:
@@ -4507,7 +4488,7 @@ indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
 
-inflection@^1.7.0, inflection@^1.7.1, inflection@^1.8.0:
+inflection@^1.12.0, inflection@^1.7.0, inflection@^1.7.1, inflection@^1.8.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
 
@@ -4564,22 +4545,22 @@ inquirer@^0.12.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz#4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"
+inquirer@^2:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-2.0.0.tgz#e1351687b90d150ca403ceaa3cefb1e3065bef4b"
   dependencies:
     ansi-escapes "^1.1.0"
     chalk "^1.0.0"
     cli-cursor "^1.0.1"
     cli-width "^2.0.0"
     external-editor "^1.1.0"
-    figures "^1.3.5"
+    figures "^2.0.0"
     lodash "^4.3.0"
     mute-stream "0.0.6"
     pinkie-promise "^2.0.0"
     run-async "^2.2.0"
     rx "^4.1.0"
-    string-width "^1.0.1"
+    string-width "^2.0.0"
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
@@ -4697,6 +4678,10 @@ is-git-url@^0.2.0:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-0.2.3.tgz#445200d6fbd6da028fb5e01440d9afc93f3ccb64"
 
+is-git-url@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
+
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -4932,6 +4917,12 @@ jsonfile@^2.1.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -5020,12 +5011,6 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
-linkify-it@~1.2.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a"
-  dependencies:
-    uc.micro "^1.0.1"
-
 lint-staged@^3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-3.6.1.tgz#24423c8b7bd99d96e15acd1ac8cb392a78e58582"
@@ -5125,14 +5110,6 @@ lodash-es@^4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
 
-lodash._arraycopy@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"
-
-lodash._arrayeach@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz#bab156b2a90d3f1bbd5c653403349e5e5933ef9e"
-
 lodash._baseassign@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
@@ -5185,10 +5162,6 @@ lodash._baseflatten@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
-lodash._basefor@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2"
-
 lodash._basetostring@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
@@ -5398,18 +5371,6 @@ lodash.isobject@~2.3.0:
   dependencies:
     lodash._objecttypes "~2.3.0"
 
-lodash.isplainobject@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz#9a8238ae16b200432960cd7346512d0123fbf4c5"
-  dependencies:
-    lodash._basefor "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.keysin "^3.0.0"
-
-lodash.istypedarray@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62"
-
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
@@ -5426,34 +5387,11 @@ lodash.keys@~2.3.0:
     lodash._shimkeys "~2.3.0"
     lodash.isobject "~2.3.0"
 
-lodash.keysin@^3.0.0:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-3.0.8.tgz#22c4493ebbedb1427962a54b445b2c8a767fb47f"
-  dependencies:
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
 lodash.memoize@~3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
 
-lodash.merge@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-3.3.2.tgz#0d90d93ed637b1878437bb3e21601260d7afe994"
-  dependencies:
-    lodash._arraycopy "^3.0.0"
-    lodash._arrayeach "^3.0.0"
-    lodash._createassigner "^3.0.0"
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-    lodash.isplainobject "^3.0.0"
-    lodash.istypedarray "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.keysin "^3.0.0"
-    lodash.toplainobject "^3.0.0"
-
-lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.5.1:
+lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.5.1, lodash.merge@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
 
@@ -5532,13 +5470,6 @@ lodash.templatesettings@~2.3.0:
     lodash._reinterpolate "~2.3.0"
     lodash.escape "~2.3.0"
 
-lodash.toplainobject@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz#28790ad942d293d78aa663a07ecf7f52ca04198d"
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keysin "^3.0.0"
-
 lodash.uniq@^4.2.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -5618,27 +5549,17 @@ map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
-markdown-it-terminal@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.0.4.tgz#3f2ce624ba2ca964a78b8b388d605ee330de9ced"
+markdown-it-terminal@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.1.0.tgz#545abd8dd01c3d62353bfcea71db580b51d22bd9"
   dependencies:
-    ansi-styles "^2.1.0"
-    cardinal "^0.5.0"
+    ansi-styles "^3.0.0"
+    cardinal "^1.0.0"
     cli-table "^0.3.1"
-    lodash.merge "^3.3.2"
-    markdown-it "^4.4.0"
+    lodash.merge "^4.6.0"
+    markdown-it "^8.3.1"
 
-markdown-it@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.4.0.tgz#3df373dbea587a9a7fef3e56311b68908f75c414"
-  dependencies:
-    argparse "~1.0.2"
-    entities "~1.1.1"
-    linkify-it "~1.2.0"
-    mdurl "~1.0.0"
-    uc.micro "^1.0.0"
-
-markdown-it@^8.3.0:
+markdown-it@^8.3.0, markdown-it@^8.3.1:
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.0.tgz#e2400881bf171f7018ed1bd9da441dac8af6306d"
   dependencies:
@@ -5677,7 +5598,7 @@ md5.js@^1.3.4:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-mdurl@^1.0.1, mdurl@~1.0.0:
+mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
 
@@ -6150,7 +6071,7 @@ options@>=0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
 
-ora@^0.2.0, ora@^0.2.3:
+ora@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
   dependencies:
@@ -6159,6 +6080,15 @@ ora@^0.2.0, ora@^0.2.3:
     cli-spinners "^0.1.2"
     object-assign "^4.0.1"
 
+ora@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-1.3.0.tgz#80078dd2b92a934af66a3ad72a5b910694ede51a"
+  dependencies:
+    chalk "^1.1.1"
+    cli-cursor "^2.1.0"
+    cli-spinners "^1.0.0"
+    log-symbols "^1.0.2"
+
 os-browserify@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54"
@@ -6678,11 +6608,11 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
-redeyed@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-0.5.0.tgz#7ab000e60ee3875ac115d29edb32c1403c6c25d1"
+redeyed@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a"
   dependencies:
-    esprima-fb "~12001.1.0-dev-harmony-fb"
+    esprima "~3.0.0"
 
 regenerate@^1.2.1:
   version "1.3.2"
@@ -6910,6 +6840,10 @@ rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
 
+rsvp@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.7.0.tgz#dc1b0b1a536f7dec9d2be45e0a12ad4197c9fd96"
+
 rsvp@~3.0.6:
   version "3.0.21"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.21.tgz#49c588fe18ef293bcd0ab9f4e6756e6ac433359f"
@@ -7109,22 +7043,10 @@ silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0:
   dependencies:
     debug "^2.2.0"
 
-simple-dom@^0.3.0:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-0.3.2.tgz#0663d10f1556f1500551d518f56e3aba0871371d"
-
 simple-fmt@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/simple-fmt/-/simple-fmt-0.1.0.tgz#191bf566a59e6530482cb25ab53b4a8dc85c3a6b"
 
-simple-html-tokenizer@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.3.0.tgz#9b8b5559d80e331a544dd13dd59382e5d0d94411"
-
-simple-html-tokenizer@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.4.1.tgz#028988bb7fe8b2e6645676d82052587d440b02d3"
-
 simple-is@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0"
@@ -7587,7 +7509,7 @@ testem@1.15.0:
     tap-parser "^5.1.0"
     xmldom "^0.1.19"
 
-testem@^1.15.0:
+testem@^1.18.0:
   version "1.18.4"
   resolved "https://registry.yarnpkg.com/testem/-/testem-1.18.4.tgz#e45fed922bec2f54a616c43f11922598ac97eb41"
   dependencies:
@@ -7763,7 +7685,7 @@ typedarray@^0.0.6, typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.3:
+uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
 
@@ -7809,6 +7731,10 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
+universalify@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
+
 unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

From 5a94a50074f28bb6f98d5137609c435367493a99 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 11 Dec 2017 17:59:26 -0800
Subject: [PATCH 06/48] Upgrade to Ember Data 2.17

---
 ui/package.json |  2 +-
 ui/yarn.lock    | 49 ++++++++++---------------------------------------
 2 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index dd49aa5f1..3c7c3b842 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -52,7 +52,7 @@
     "ember-cli-uglify": "^1.2.0",
     "ember-composable-helpers": "^2.0.3",
     "ember-concurrency": "^0.8.12",
-    "ember-data": "^2.14.0",
+    "ember-data": "~2.17.0",
     "ember-data-model-fragments": "^2.14.0",
     "ember-export-application-global": "^2.0.0",
     "ember-fetch": "^3.2.7",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index de9eb1405..0f0c39d00 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -567,7 +567,7 @@ babel-plugin-debug-macros@^0.1.10, babel-plugin-debug-macros@^0.1.11:
   dependencies:
     semver "^5.3.0"
 
-babel-plugin-ember-modules-api-polyfill@^1.5.1:
+babel-plugin-ember-modules-api-polyfill@^1.4.2, babel-plugin-ember-modules-api-polyfill@^1.5.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-1.6.0.tgz#abd1afa4237b3121cb51222f9bf3283cad8990aa"
   dependencies:
@@ -1705,7 +1705,7 @@ cached-path-relative@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
 
-calculate-cache-key-for-tree@^1.0.0:
+calculate-cache-key-for-tree@^1.0.0, calculate-cache-key-for-tree@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-1.1.0.tgz#0c3e42c9c134f3c9de5358c0f16793627ea976d6"
   dependencies:
@@ -2217,7 +2217,7 @@ cross-spawn@^3.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^5.0.0, cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
   dependencies:
@@ -3028,11 +3028,12 @@ ember-data-model-fragments@^2.14.0:
     git-repo-info "^1.4.1"
     npm-git-info "^1.0.3"
 
-ember-data@^2.14.0:
-  version "2.14.10"
-  resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.14.10.tgz#acf66ffffb062a7fc999f9d989d0e0d2e3858cd3"
+ember-data@~2.17.0:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.17.0.tgz#d952cf98d7461abf41ed6d248cf2a5836c623276"
   dependencies:
     amd-name-resolver "0.0.7"
+    babel-plugin-ember-modules-api-polyfill "^1.4.2"
     babel-plugin-feature-flags "^0.3.1"
     babel-plugin-filter-imports "^0.3.1"
     babel-plugin-transform-es2015-block-scoping "^6.24.1"
@@ -3042,10 +3043,11 @@ ember-data@^2.14.0:
     broccoli-debug "^0.6.2"
     broccoli-file-creator "^1.0.0"
     broccoli-funnel "^1.2.0"
-    broccoli-merge-trees "^1.0.0"
+    broccoli-merge-trees "^2.0.0"
     broccoli-rollup "^1.2.0"
+    calculate-cache-key-for-tree "^1.1.0"
     chalk "^1.1.1"
-    ember-cli-babel "^6.4.1"
+    ember-cli-babel "^6.8.2"
     ember-cli-path-utils "^1.0.0"
     ember-cli-string-utils "^1.0.0"
     ember-cli-test-info "^1.0.0"
@@ -3059,7 +3061,6 @@ ember-data@^2.14.0:
     npm-git-info "^1.0.0"
     semver "^5.1.0"
     silent-error "^1.0.0"
-    testem "1.15.0"
 
 ember-export-application-global@^2.0.0:
   version "2.0.0"
@@ -7479,36 +7480,6 @@ temp@0.8.3:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
 
-testem@1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-1.15.0.tgz#2e3a9e7ac29f16a20f718eb0c4b12e7a44900675"
-  dependencies:
-    backbone "^1.1.2"
-    bluebird "^3.4.6"
-    charm "^1.0.0"
-    commander "^2.6.0"
-    consolidate "^0.14.0"
-    cross-spawn "^5.0.0"
-    express "^4.10.7"
-    fireworm "^0.7.0"
-    glob "^7.0.4"
-    http-proxy "^1.13.1"
-    js-yaml "^3.2.5"
-    lodash.assignin "^4.1.0"
-    lodash.clonedeep "^4.4.1"
-    lodash.find "^4.5.1"
-    mkdirp "^0.5.1"
-    mustache "^2.2.1"
-    node-notifier "^5.0.1"
-    npmlog "^4.0.0"
-    printf "^0.2.3"
-    rimraf "^2.4.4"
-    socket.io "1.6.0"
-    spawn-args "^0.2.0"
-    styled_string "0.0.1"
-    tap-parser "^5.1.0"
-    xmldom "^0.1.19"
-
 testem@^1.18.0:
   version "1.18.4"
   resolved "https://registry.yarnpkg.com/testem/-/testem-1.18.4.tgz#e45fed922bec2f54a616c43f11922598ac97eb41"

From cb3e4a3905e93c3ac3235018322f82b4f17d5def Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 11 Dec 2017 18:27:53 -0800
Subject: [PATCH 07/48] Never use native fetch when mirage is enabled

Unfortunately, Mirage/Pretender don't support fetch
---
 ui/app/utils/fetch.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/app/utils/fetch.js b/ui/app/utils/fetch.js
index 98b81a889..bad071006 100644
--- a/ui/app/utils/fetch.js
+++ b/ui/app/utils/fetch.js
@@ -1,8 +1,10 @@
 import Ember from 'ember';
 import fetch from 'fetch';
+import config from '../config/environment';
 
 // The ember-fetch polyfill does not provide streaming
 // Additionally, Mirage/Pretender does not support fetch
-const fetchToUse = Ember.testing ? fetch : window.fetch || fetch;
+const mirageEnabled = config['ember-cli-mirage'] && config['ember-cli-mirage'].enabled !== false;
+const fetchToUse = Ember.testing || mirageEnabled ? fetch : window.fetch || fetch;
 
 export default fetchToUse;

From e892d48608e4c86b8a411247ba5205f9b2eba85a Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 12 Dec 2017 13:28:40 -0800
Subject: [PATCH 08/48] Upgrade Ember CLI Mirage to 0.4.1

---
 ui/mirage/config.js |  1 +
 ui/package.json     |  2 +-
 ui/yarn.lock        | 46 +++++++++++++++++++++++++++++++--------------
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/ui/mirage/config.js b/ui/mirage/config.js
index dd23a35e7..b32c70b7c 100644
--- a/ui/mirage/config.js
+++ b/ui/mirage/config.js
@@ -14,6 +14,7 @@ export default function() {
   this.timing = 0; // delay for each request, automatically set to 0 during testing
 
   this.namespace = 'v1';
+  this.trackRequests = Ember.testing;
 
   this.get('/jobs', function({ jobs }, { queryParams }) {
     const json = this.serialize(jobs.all());
diff --git a/ui/package.json b/ui/package.json
index 3c7c3b842..490c8bff8 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -42,7 +42,7 @@
     "ember-cli-htmlbars": "^1.1.1",
     "ember-cli-htmlbars-inline-precompile": "^0.4.0",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-mirage": "^0.3.3",
+    "ember-cli-mirage": "^0.4.1",
     "ember-cli-moment-shim": "^3.3.3",
     "ember-cli-qunit": "^4.0.0",
     "ember-cli-sass": "^6.2.0",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 0f0c39d00..2b7e95bb9 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -2596,6 +2596,24 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-be
     clone "^2.0.0"
     ember-cli-version-checker "^2.0.0"
 
+ember-cli-babel@^6.3.0:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.10.0.tgz#81424acd1d97fb13658168121eeb2007d6edee84"
+  dependencies:
+    amd-name-resolver "0.0.7"
+    babel-plugin-debug-macros "^0.1.11"
+    babel-plugin-ember-modules-api-polyfill "^2.0.1"
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-polyfill "^6.16.0"
+    babel-preset-env "^1.5.1"
+    broccoli-babel-transpiler "^6.1.2"
+    broccoli-debug "^0.6.2"
+    broccoli-funnel "^1.0.0"
+    broccoli-source "^1.1.0"
+    clone "^2.0.0"
+    ember-cli-version-checker "^2.1.0"
+    semver "^5.4.1"
+
 ember-cli-babel@^6.8.2:
   version "6.9.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.9.0.tgz#5147391389bdbb7091d15f81ae1dff1eb49d71aa"
@@ -2726,23 +2744,23 @@ ember-cli-lodash-subset@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
 
-ember-cli-mirage@^0.3.3:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.3.4.tgz#eeb9d6e02c0c49c81915762178bab9a42d86ada8"
+ember-cli-mirage@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.4.1.tgz#bfdfe61e5e74dc3881ed31f12112dae1a29f0d4c"
   dependencies:
     broccoli-funnel "^1.0.2"
     broccoli-merge-trees "^1.1.0"
     broccoli-stew "^1.5.0"
     chalk "^1.1.1"
-    ember-cli-babel "^5.1.7"
+    ember-cli-babel "^6.8.2"
     ember-cli-node-assets "^0.1.4"
-    ember-get-config "0.2.1"
+    ember-get-config "^0.2.2"
     ember-inflector "^2.0.0"
     ember-lodash "^4.17.3"
     exists-sync "0.0.3"
     fake-xml-http-request "^1.4.0"
     faker "^3.0.0"
-    pretender "^1.4.2"
+    pretender "^1.6.1"
     route-recognizer "^0.2.3"
 
 ember-cli-moment-shim@^3.3.3:
@@ -3104,12 +3122,12 @@ ember-freestyle@^0.4.1:
     glob "^7.1.1"
     highlight.js "^9.3.0"
 
-ember-get-config@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.2.1.tgz#a1325cceefcb4534c78fc6ccb2be87a3feda6817"
+ember-get-config@^0.2.2:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.2.4.tgz#118492a2a03d73e46004ed777928942021fe1ecd"
   dependencies:
     broccoli-file-creator "^1.1.1"
-    ember-cli-babel "^5.1.6"
+    ember-cli-babel "^6.3.0"
 
 ember-getowner-polyfill@^1.2.2:
   version "1.2.5"
@@ -6332,9 +6350,9 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-pretender@^1.4.2:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pretender/-/pretender-1.5.1.tgz#bd9098c03d39c3bc7dcb84a28ee27e096e2e32b8"
+pretender@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/pretender/-/pretender-1.6.1.tgz#77d1e42ac8c6b298f5cd43534a87645df035db8c"
   dependencies:
     fake-xml-http-request "^1.6.0"
     route-recognizer "^0.3.3"
@@ -6933,7 +6951,7 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.1.1, semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.1.1, semver@^5.3.0, semver@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 

From 53e60500f30df2bdb2d0d7774520add11591b3d9 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 12 Dec 2017 16:44:41 -0800
Subject: [PATCH 09/48] Upgrade ember-browserify to 1.2

---
 ui/package.json |  2 +-
 ui/yarn.lock    | 90 +++++++++++++++++++++++++++++++++++--------------
 2 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index 490c8bff8..1f758b8b6 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -33,7 +33,7 @@
     "d3-selection": "^1.1.0",
     "d3-transition": "^1.1.0",
     "ember-ajax": "^3.0.0",
-    "ember-browserify": "^1.1.13",
+    "ember-browserify": "^1.2.0",
     "ember-cli": "2.17.1",
     "ember-cli-babel": "^6.0.0",
     "ember-cli-bourbon": "2.0.0-beta.1",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 2b7e95bb9..d3b90f0dd 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -51,7 +51,11 @@ acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-acorn@^5.0.3, acorn@^5.1.1:
+acorn@^5.0.3, acorn@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
+
+acorn@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75"
 
@@ -248,8 +252,8 @@ arrify@^1.0.0:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
 asn1.js@^4.0.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.2.tgz#8117ef4f7ed87cd8f89044b5bff97ac243a16c9a"
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -1550,14 +1554,15 @@ browser-resolve@^1.11.0, browser-resolve@^1.7.0:
     resolve "1.1.7"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
   dependencies:
-    buffer-xor "^1.0.2"
+    buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
     create-hash "^1.1.0"
-    evp_bytestokey "^1.0.0"
+    evp_bytestokey "^1.0.3"
     inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
 browserify-cipher@^1.0.0:
   version "1.0.0"
@@ -1665,7 +1670,7 @@ bser@^2.0.0:
   dependencies:
     node-int64 "^0.4.0"
 
-buffer-xor@^1.0.2:
+buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
 
@@ -2232,8 +2237,8 @@ cryptiles@2.x.x:
     boom "2.x.x"
 
 crypto-browserify@^3.0.0:
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.1.tgz#948945efc6757a400d6e5e5af47194d10064279f"
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -2245,6 +2250,7 @@ crypto-browserify@^3.0.0:
     pbkdf2 "^3.0.3"
     public-encrypt "^4.0.0"
     randombytes "^2.0.0"
+    randomfill "^1.0.3"
 
 crypto-random-string@^1.0.0:
   version "1.0.0"
@@ -2451,7 +2457,14 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detective@^4.0.0, detective@^4.3.1:
+detective@^4.0.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.0.tgz#6276e150f9e50829ad1f90ace4d9a2304188afcf"
+  dependencies:
+    acorn "^5.2.1"
+    defined "^1.0.0"
+
+detective@^4.3.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/detective/-/detective-4.5.0.tgz#6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"
   dependencies:
@@ -2542,7 +2555,7 @@ ember-basic-dropdown@^0.33.1:
     ember-native-dom-helpers "^0.5.4"
     ember-wormhole "^0.5.2"
 
-ember-browserify@^1.1.13:
+ember-browserify@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ember-browserify/-/ember-browserify-1.2.0.tgz#c774896dc44ab2c5c608226f31628994348a3fd5"
   dependencies:
@@ -3667,9 +3680,9 @@ events@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
 
-evp_bytestokey@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.2.tgz#f66bb88ecd57f71a766821e20283ea38c68bf80a"
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
@@ -4054,7 +4067,16 @@ fs-readdir-recursive@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059"
 
-fs-tree-diff@^0.5.0, fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6:
+fs-tree-diff@^0.5.0:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.7.tgz#315e2b098d5fe7f622880ac965b1b051868ac871"
+  dependencies:
+    heimdalljs-logger "^0.1.7"
+    object-assign "^4.1.0"
+    path-posix "^1.0.0"
+    symlink-or-copy "^1.1.8"
+
+fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.6.tgz#342665749e8dca406800b672268c8f5073f3e623"
   dependencies:
@@ -4643,7 +4665,11 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.0, is-buffer@^1.1.5, is-buffer@~1.1.2:
+is-buffer@^1.1.0:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
+is-buffer@^1.1.5, is-buffer@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
 
@@ -5694,8 +5720,8 @@ micromatch@^2.1.5, micromatch@^2.3.7:
     regex-cache "^0.4.2"
 
 miller-rabin@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
@@ -6299,8 +6325,8 @@ path-type@^2.0.0:
     pify "^2.0.0"
 
 pbkdf2@^3.0.3:
-  version "3.0.13"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.13.tgz#c37d295531e786b1da3e3eadc840426accb0ae25"
+  version "3.0.14"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -6485,12 +6511,19 @@ randomatic@^1.1.3:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-randombytes@^2.0.0, randombytes@^2.0.1:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
   dependencies:
     safe-buffer "^5.1.0"
 
+randomfill@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
 range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
@@ -6798,12 +6831,18 @@ resolve@1.3.2:
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.1.2, resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.0, resolve@^1.3.3, resolve@^1.4.0:
+resolve@^1.1.2, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.0, resolve@^1.3.3, resolve@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86"
   dependencies:
     path-parse "^1.0.5"
 
+resolve@^1.1.3, resolve@^1.1.4:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
+  dependencies:
+    path-parse "^1.0.5"
+
 restore-cursor@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
@@ -7003,10 +7042,11 @@ setprototypeof@1.0.3:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
 
 sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
+  version "2.4.9"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.9.tgz#98f64880474b74f4a38b8da9d3c0f2d104633e7d"
   dependencies:
     inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
 shasum@^1.0.0:
   version "1.0.2"

From c5c2c2bd147234aa13c5c769d7e0ab76c045b1b4 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 12 Dec 2017 19:14:19 -0800
Subject: [PATCH 10/48] Upgrade various minor dependencies

---
 ui/package.json |  33 ++-
 ui/yarn.lock    | 623 +++++++++++++++++++++++-------------------------
 2 files changed, 309 insertions(+), 347 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index 1f758b8b6..90e888938 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -37,40 +37,39 @@
     "ember-cli": "2.17.1",
     "ember-cli-babel": "^6.0.0",
     "ember-cli-bourbon": "2.0.0-beta.1",
-    "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "^3.0.0",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.4.0",
+    "ember-cli-dependency-checker": "^2.1.0",
+    "ember-cli-eslint": "^4.2.3",
+    "ember-cli-htmlbars": "^2.0.3",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.2",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-mirage": "^0.4.1",
-    "ember-cli-moment-shim": "^3.3.3",
+    "ember-cli-moment-shim": "^3.5.0",
     "ember-cli-qunit": "^4.0.0",
     "ember-cli-sass": "^6.2.0",
-    "ember-cli-shims": "^1.1.0",
+    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-string-helpers": "^1.4.0",
-    "ember-cli-uglify": "^1.2.0",
+    "ember-cli-string-helpers": "^1.5.0",
+    "ember-cli-uglify": "^2.0.0",
     "ember-composable-helpers": "^2.0.3",
     "ember-concurrency": "^0.8.12",
     "ember-data": "~2.17.0",
     "ember-data-model-fragments": "^2.14.0",
     "ember-export-application-global": "^2.0.0",
-    "ember-fetch": "^3.2.7",
+    "ember-fetch": "^3.4.3",
     "ember-freestyle": "^0.4.1",
-    "ember-href-to": "^1.13.0",
     "ember-inline-svg": "^0.1.11",
     "ember-load-initializers": "^1.0.0",
-    "ember-moment": "^7.3.1",
+    "ember-moment": "^7.5.0",
     "ember-native-dom-helpers": "^0.5.4",
-    "ember-power-select": "^1.9.9",
-    "ember-resolver": "^4.0.0",
+    "ember-power-select": "^1.10.4",
+    "ember-resolver": "^4.5.0",
     "ember-sinon": "^0.7.0",
     "ember-source": "~2.17.0",
-    "ember-truth-helpers": "^1.3.0",
+    "ember-truth-helpers": "^2.0.0",
     "ember-welcome-page": "^3.0.0",
-    "eslint": "^4.0.0",
-    "flat": "^2.0.1",
-    "husky": "^0.13.4",
+    "eslint": "^4.13.1",
+    "flat": "^4.0.0",
+    "husky": "^0.14.3",
     "json-formatter-js": "^2.2.0",
     "lint-staged": "^3.6.1",
     "loader.js": "^4.2.3",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index d3b90f0dd..37cf1a911 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -83,6 +83,15 @@ ajv@^5.2.0:
     json-schema-traverse "^0.3.0"
     json-stable-stringify "^1.0.1"
 
+ajv@^5.3.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.1.tgz#b38bb8876d9e86bee994956a04e721e88b248eb2"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -348,7 +357,7 @@ aws4@^1.2.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
-babel-code-frame@^6.16.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -1350,14 +1359,14 @@ broccoli-kitchen-sink-helpers@^0.3.1:
     glob "^5.0.10"
     mkdirp "^0.5.1"
 
-broccoli-lint-eslint@^3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/broccoli-lint-eslint/-/broccoli-lint-eslint-3.3.1.tgz#35c675546a5a7ad8f3319edd732e3aad8ca241de"
+broccoli-lint-eslint@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/broccoli-lint-eslint/-/broccoli-lint-eslint-4.2.1.tgz#f780dc083a7357a9746a9cfa8f76feb092777477"
   dependencies:
     aot-test-generators "^0.1.0"
     broccoli-concat "^3.2.2"
-    broccoli-persistent-filter "^1.2.0"
-    eslint "^3.0.0"
+    broccoli-persistent-filter "^1.4.3"
+    eslint "^4.0.0"
     json-stable-stringify "^1.0.1"
     lodash.defaultsdeep "^4.6.0"
     md5-hex "^2.0.0"
@@ -1389,7 +1398,7 @@ broccoli-middleware@^1.0.0:
     handlebars "^4.0.4"
     mime "^1.2.11"
 
-broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.4.0, broccoli-persistent-filter@^1.4.2:
+broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.0, broccoli-persistent-filter@^1.4.2, broccoli-persistent-filter@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.3.tgz#3511bc52fc53740cda51621f58a28152d9911bc1"
   dependencies:
@@ -1472,7 +1481,7 @@ broccoli-sri-hash@^2.1.0:
     sri-toolbox "^0.2.0"
     symlink-or-copy "^1.0.1"
 
-broccoli-stew@^1.2.0, broccoli-stew@^1.3.3, broccoli-stew@^1.4.0, broccoli-stew@^1.4.2, broccoli-stew@^1.5.0:
+broccoli-stew@^1.2.0, broccoli-stew@^1.3.3, broccoli-stew@^1.4.2, broccoli-stew@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.5.0.tgz#d7af8c18511dce510e49d308a62e5977f461883c"
   dependencies:
@@ -1506,19 +1515,19 @@ broccoli-templater@^1.0.0:
     broccoli-stew "^1.2.0"
     lodash.template "^3.3.2"
 
-broccoli-uglify-sourcemap@^1.0.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.5.2.tgz#04f84ab0db539031fa868ccfa563c9932d50cedb"
+broccoli-uglify-sourcemap@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-2.0.1.tgz#e8f2f6c49e04b6e921f1ecd30e12f06fb75e585f"
   dependencies:
     broccoli-plugin "^1.2.1"
-    debug "^2.2.0"
-    lodash.merge "^4.5.1"
-    matcher-collection "^1.0.0"
+    debug "^3.1.0"
+    lodash.defaultsdeep "^4.6.0"
+    matcher-collection "^1.0.5"
     mkdirp "^0.5.0"
-    source-map-url "^0.3.0"
+    source-map-url "^0.4.0"
     symlink-or-copy "^1.0.1"
-    uglify-js "^2.7.0"
-    walk-sync "^0.1.3"
+    uglify-es "^3.1.3"
+    walk-sync "^0.3.2"
 
 broccoli-unwatched-tree@^0.1.1:
   version "0.1.3"
@@ -1664,6 +1673,13 @@ browserslist@^2.1.2:
     caniuse-lite "^1.0.30000718"
     electron-to-chromium "^1.3.18"
 
+browserslist@^2.2.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.10.0.tgz#bac5ee1cc69ca9d96403ffb8a3abdc5b6aed6346"
+  dependencies:
+    caniuse-lite "^1.0.30000780"
+    electron-to-chromium "^1.3.28"
+
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -1763,6 +1779,10 @@ caniuse-lite@^1.0.30000718:
   version "1.0.30000718"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000718.tgz#0dd24290beb11310b2d80f6b70a823c2a65a6fad"
 
+caniuse-lite@^1.0.30000780:
+  version "1.0.30000782"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000782.tgz#5b82b8c385f25348745c471ca51320afb1b7f254"
+
 capture-exit@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
@@ -2013,6 +2033,10 @@ commander@2.9.0, commander@^2.5.0, commander@^2.6.0, commander@^2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
+commander@~2.12.1:
+  version "2.12.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
+
 commoner@~0.10.3:
   version "0.10.8"
   resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5"
@@ -2065,7 +2089,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.2, concat-stream@^1.6.0:
+concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -2157,10 +2181,14 @@ core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
-core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0:
+core-js@^2.4.0, core-js@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.0.tgz#569c050918be6486b3837552028ae0466b717086"
 
+core-js@^2.4.1:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+
 core-object@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/core-object/-/core-object-1.1.0.tgz#86d63918733cf9da1a5aae729e62c0a88e66ad0a"
@@ -2288,16 +2316,16 @@ d3-interpolate@1:
     d3-color "1"
 
 d3-selection@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.1.0.tgz#1998684896488f839ca0372123da34f1d318809c"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.2.0.tgz#1b8ec1c7cedadfb691f2ba20a4a3cfbeb71bbc88"
 
 d3-timer@1:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.6.tgz#4044bf15d7025c06ce7d1149f73cd07b54dbd784"
 
 d3-transition@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.0.tgz#cfc85c74e5239324290546623572990560c3966f"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.1.tgz#d8ef89c3b848735b060e54a39b32aaebaa421039"
   dependencies:
     d3-color "1"
     d3-dispatch "1"
@@ -2348,6 +2376,12 @@ debug@2.6.8, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.4.
   dependencies:
     ms "2.0.0"
 
+debug@^3.0.1, debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -2490,6 +2524,12 @@ doctrine@^2.0.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
+doctrine@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075"
+  dependencies:
+    esutils "^2.0.2"
+
 domain-browser@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
@@ -2524,6 +2564,10 @@ electron-to-chromium@^1.3.18:
   version "1.3.18"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz#3dcc99da3e6b665f6abbc71c28ad51a2cd731a9c"
 
+electron-to-chromium@^1.3.28:
+  version "1.3.28"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.28.tgz#8dd4e6458086644e9f9f0a1cf32e2a1f9dffd9ee"
+
 elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
@@ -2546,11 +2590,11 @@ ember-ajax@^3.0.0:
   dependencies:
     ember-cli-babel "^6.0.0"
 
-ember-basic-dropdown@^0.33.1:
-  version "0.33.6"
-  resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-0.33.6.tgz#120d462c33ee5ea5ccb25a169e2b5af20d762d8a"
+ember-basic-dropdown@^0.34.0:
+  version "0.34.0"
+  resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-0.34.0.tgz#a0371b7c06756cdd3170e7d4a9ed4f4890bc2d59"
   dependencies:
-    ember-cli-babel "^6.8.1"
+    ember-cli-babel "^6.8.2"
     ember-cli-htmlbars "^2.0.3"
     ember-native-dom-helpers "^0.5.4"
     ember-wormhole "^0.5.2"
@@ -2592,24 +2636,7 @@ ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7:
     ember-cli-version-checker "^1.0.2"
     resolve "^1.1.2"
 
-ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9, ember-cli-babel@^6.1.0, ember-cli-babel@^6.4.1, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1:
-  version "6.8.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.8.1.tgz#695f94c57a9375c2a0e219306a41105d6b937991"
-  dependencies:
-    amd-name-resolver "0.0.7"
-    babel-plugin-debug-macros "^0.1.11"
-    babel-plugin-ember-modules-api-polyfill "^1.5.1"
-    babel-plugin-transform-es2015-modules-amd "^6.24.0"
-    babel-polyfill "^6.16.0"
-    babel-preset-env "^1.5.1"
-    broccoli-babel-transpiler "^6.1.2"
-    broccoli-debug "^0.6.2"
-    broccoli-funnel "^1.0.0"
-    broccoli-source "^1.1.0"
-    clone "^2.0.0"
-    ember-cli-version-checker "^2.0.0"
-
-ember-cli-babel@^6.3.0:
+ember-cli-babel@^6.0.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.7.2:
   version "6.10.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.10.0.tgz#81424acd1d97fb13658168121eeb2007d6edee84"
   dependencies:
@@ -2627,6 +2654,23 @@ ember-cli-babel@^6.3.0:
     ember-cli-version-checker "^2.1.0"
     semver "^5.4.1"
 
+ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9, ember-cli-babel@^6.1.0, ember-cli-babel@^6.4.1, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1:
+  version "6.8.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.8.1.tgz#695f94c57a9375c2a0e219306a41105d6b937991"
+  dependencies:
+    amd-name-resolver "0.0.7"
+    babel-plugin-debug-macros "^0.1.11"
+    babel-plugin-ember-modules-api-polyfill "^1.5.1"
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-polyfill "^6.16.0"
+    babel-preset-env "^1.5.1"
+    broccoli-babel-transpiler "^6.1.2"
+    broccoli-debug "^0.6.2"
+    broccoli-funnel "^1.0.0"
+    broccoli-source "^1.1.0"
+    clone "^2.0.0"
+    ember-cli-version-checker "^2.0.0"
+
 ember-cli-babel@^6.8.2:
   version "6.9.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.9.0.tgz#5147391389bdbb7091d15f81ae1dff1eb49d71aa"
@@ -2662,21 +2706,22 @@ ember-cli-broccoli-sane-watcher@^2.0.4:
     rsvp "^3.0.18"
     sane "^1.1.1"
 
-ember-cli-dependency-checker@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-1.4.0.tgz#2b13f977e1eea843fc1a21a001be6ca5d4ef1942"
+ember-cli-dependency-checker@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-2.1.0.tgz#9d66286a7c778e94733eaf21320d129c4fd0dd64"
   dependencies:
-    chalk "^0.5.1"
-    is-git-url "^0.2.0"
-    semver "^4.1.0"
+    chalk "^1.1.3"
+    is-git-url "^1.0.0"
+    resolve "^1.5.0"
+    semver "^5.3.0"
 
-ember-cli-eslint@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-eslint/-/ember-cli-eslint-3.1.0.tgz#8d9e2a867654835ac1b24858d9117e143fa54bd4"
+ember-cli-eslint@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/ember-cli-eslint/-/ember-cli-eslint-4.2.3.tgz#2844d3f5e8184f19b2d7132ba99eb0b370b55598"
   dependencies:
-    broccoli-lint-eslint "^3.3.0"
-    ember-cli-version-checker "^1.3.1"
-    rsvp "^3.2.1"
+    broccoli-lint-eslint "^4.2.1"
+    ember-cli-version-checker "^2.1.0"
+    rsvp "^4.6.1"
     walk-sync "^0.3.0"
 
 ember-cli-get-component-path-option@^1.0.0:
@@ -2687,13 +2732,14 @@ ember-cli-get-dependency-depth@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-get-dependency-depth/-/ember-cli-get-dependency-depth-1.0.0.tgz#e0afecf82a2d52f00f28ab468295281aec368d11"
 
-ember-cli-htmlbars-inline-precompile@^0.4.0:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-0.4.4.tgz#24a7617152630d64a047e553b72e00963a4f8d73"
+ember-cli-htmlbars-inline-precompile@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-1.0.2.tgz#5b544f664d5d9911f08cd979c5f70d8cb0ca2add"
   dependencies:
     babel-plugin-htmlbars-inline-precompile "^0.2.3"
     ember-cli-version-checker "^2.0.0"
     hash-for-dep "^1.0.2"
+    heimdalljs-logger "^0.1.7"
     silent-error "^1.1.0"
 
 ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.1.1, ember-cli-htmlbars@^1.3.0:
@@ -2776,21 +2822,21 @@ ember-cli-mirage@^0.4.1:
     pretender "^1.6.1"
     route-recognizer "^0.2.3"
 
-ember-cli-moment-shim@^3.3.3:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-moment-shim/-/ember-cli-moment-shim-3.4.0.tgz#2fbe13d8654097da86abb64016cddf12ff19a3de"
+ember-cli-moment-shim@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-moment-shim/-/ember-cli-moment-shim-3.5.0.tgz#7ea8d42b0a04c767258287b30447681e52fba0c4"
   dependencies:
-    broccoli-funnel "^1.1.0"
+    broccoli-funnel "^2.0.0"
     broccoli-merge-trees "^2.0.0"
     broccoli-source "^1.1.0"
-    broccoli-stew "^1.4.0"
+    broccoli-stew "^1.5.0"
     chalk "^1.1.3"
-    ember-cli-babel "^6.6.0"
+    ember-cli-babel "^6.8.2"
     ember-cli-import-polyfill "^0.2.0"
     exists-sync "^0.0.4"
     lodash.defaults "^4.2.0"
     moment "^2.18.1"
-    moment-timezone "~0.5.11"
+    moment-timezone "^0.5.13"
 
 ember-cli-node-assets@^0.1.4:
   version "0.1.6"
@@ -2851,12 +2897,14 @@ ember-cli-sass@^6.1.3, ember-cli-sass@^6.2.0:
     ember-cli-version-checker "^1.0.2"
     merge "^1.2.0"
 
-ember-cli-shims@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-shims/-/ember-cli-shims-1.1.0.tgz#0e3b8a048be865b4f81cc81d397ff1eeb13f75b6"
+ember-cli-shims@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-shims/-/ember-cli-shims-1.2.0.tgz#0f53aff0aab80b5f29da3a9731bac56169dd941f"
   dependencies:
-    ember-cli-babel "^6.0.0-beta.7"
-    ember-cli-version-checker "^1.2.0"
+    broccoli-file-creator "^1.1.1"
+    broccoli-merge-trees "^2.0.0"
+    ember-cli-version-checker "^2.0.0"
+    ember-rfc176-data "^0.3.1"
     silent-error "^1.0.1"
 
 ember-cli-showdown@^3.2.1:
@@ -2879,12 +2927,12 @@ ember-cli-sri@^2.1.0:
   dependencies:
     broccoli-sri-hash "^2.1.0"
 
-ember-cli-string-helpers@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-string-helpers/-/ember-cli-string-helpers-1.4.0.tgz#f7142a9499a149f69a9f2662b94f5f21eae0ec48"
+ember-cli-string-helpers@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-string-helpers/-/ember-cli-string-helpers-1.5.0.tgz#b7c1b27ffd4bb4bf4846b3167f730f0125a96f44"
   dependencies:
     broccoli-funnel "^1.0.1"
-    ember-cli-babel "^5.1.7"
+    ember-cli-babel "^6.3.0"
 
 ember-cli-string-utils@^1.0.0, ember-cli-string-utils@^1.1.0:
   version "1.1.0"
@@ -2902,11 +2950,12 @@ ember-cli-test-loader@^2.0.0:
   dependencies:
     ember-cli-babel "^6.8.1"
 
-ember-cli-uglify@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-1.2.0.tgz#3208c32b54bc2783056e8bb0d5cfe9bbaf17ffb2"
+ember-cli-uglify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-2.0.0.tgz#b096727d7d1718acc9bfe5d1bc81ce26cafdf6ca"
   dependencies:
-    broccoli-uglify-sourcemap "^1.0.0"
+    broccoli-uglify-sourcemap "^2.0.0"
+    lodash.defaultsdeep "^4.6.0"
 
 ember-cli-valid-component-name@^1.0.0:
   version "1.0.0"
@@ -2914,7 +2963,7 @@ ember-cli-valid-component-name@^1.0.0:
   dependencies:
     silent-error "^1.0.0"
 
-ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0, ember-cli-version-checker@^1.3.1:
+ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72"
   dependencies:
@@ -3030,15 +3079,6 @@ ember-composable-helpers@^2.0.3:
     broccoli-funnel "^1.0.1"
     ember-cli-babel "^6.1.0"
 
-ember-concurrency@^0.8.1:
-  version "0.8.10"
-  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.8.10.tgz#5788d1a43ed1e73562495719b29efe903c789675"
-  dependencies:
-    babel-core "^6.24.1"
-    ember-cli-babel "^6.6.0"
-    ember-getowner-polyfill "^2.0.0"
-    ember-maybe-import-regenerator "^0.1.5"
-
 ember-concurrency@^0.8.12:
   version "0.8.12"
   resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.8.12.tgz#fb91180e5efeb1024cfa2cfb99d2fe6721930c91"
@@ -3105,15 +3145,15 @@ ember-factory-for-polyfill@^1.1.0:
   dependencies:
     ember-cli-version-checker "^1.2.0"
 
-ember-fetch@^3.2.7:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-3.3.1.tgz#47f7c0d282bfe61d4899f3a9d5af9f71e5558910"
+ember-fetch@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-3.4.3.tgz#fb8ba73148bb2399a82b037e4fdf9a953cd496ba"
   dependencies:
     broccoli-funnel "^1.2.0"
     broccoli-stew "^1.4.2"
     broccoli-templater "^1.0.0"
     ember-cli-babel "^6.8.1"
-    node-fetch "^2.0.0-alpha.3"
+    node-fetch "^2.0.0-alpha.9"
     whatwg-fetch "^2.0.3"
 
 ember-freestyle@^0.4.1:
@@ -3157,12 +3197,6 @@ ember-getowner-polyfill@^2.0.0, ember-getowner-polyfill@^2.0.1:
     ember-cli-version-checker "^1.2.0"
     ember-factory-for-polyfill "^1.1.0"
 
-ember-href-to@^1.13.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/ember-href-to/-/ember-href-to-1.13.0.tgz#308ab4803d9d08e30a92af888cc67412a800468d"
-  dependencies:
-    ember-cli-babel "^5.1.6"
-
 ember-inflector@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.0.1.tgz#e9ac469ffa17992a43276bb1c9b8d87992b10d37"
@@ -3202,14 +3236,14 @@ ember-lodash@^4.17.3:
     ember-cli-babel "^6.4.1"
     lodash-es "^4.17.4"
 
-ember-macro-helpers@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/ember-macro-helpers/-/ember-macro-helpers-0.15.1.tgz#a402651fafb3a25b3612a8c09843bc4061553a13"
+ember-macro-helpers@^0.17.0:
+  version "0.17.0"
+  resolved "https://registry.yarnpkg.com/ember-macro-helpers/-/ember-macro-helpers-0.17.0.tgz#5e64a49f476e38c1916aff75f949455533cd1abe"
   dependencies:
-    ember-cli-babel "^6.0.0"
+    ember-cli-babel "^6.6.0"
     ember-cli-string-utils "^1.1.0"
     ember-cli-test-info "^1.0.0"
-    ember-weakmap "^2.0.0"
+    ember-weakmap "^3.0.0"
 
 ember-maybe-import-regenerator@^0.1.5:
   version "0.1.6"
@@ -3220,31 +3254,31 @@ ember-maybe-import-regenerator@^0.1.5:
     ember-cli-babel "^6.0.0-beta.4"
     regenerator-runtime "^0.9.5"
 
-ember-moment@^7.3.1:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-7.4.1.tgz#88018c4d981643bb4521ad39539f60ba3ec6bf42"
+ember-moment@^7.5.0:
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-7.5.0.tgz#9ed25b32ae941b2f1d9116c44f518a52bdb01722"
   dependencies:
-    ember-cli-babel "^6.6.0"
+    ember-cli-babel "^6.7.2"
     ember-getowner-polyfill "^2.0.1"
-    ember-macro-helpers "^0.15.1"
+    ember-macro-helpers "^0.17.0"
 
 ember-native-dom-helpers@^0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/ember-native-dom-helpers/-/ember-native-dom-helpers-0.5.4.tgz#0bc1506a643fb7adc0abf1d09c44a7914459296b"
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/ember-native-dom-helpers/-/ember-native-dom-helpers-0.5.10.tgz#9c7172e4ddfa5dd86830c46a936e2f8eca3e5896"
   dependencies:
     broccoli-funnel "^1.1.0"
     ember-cli-babel "^6.6.0"
 
-ember-power-select@^1.9.9:
-  version "1.9.9"
-  resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-1.9.9.tgz#24b733f5be603a434dffdb57dffe702759448ca5"
+ember-power-select@^1.10.4:
+  version "1.10.4"
+  resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-1.10.4.tgz#7f0bb8c55279375391f2d97591ed65f727061579"
   dependencies:
-    ember-basic-dropdown "^0.33.1"
-    ember-cli-babel "^6.6.0"
+    ember-basic-dropdown "^0.34.0"
+    ember-cli-babel "^6.10.0"
     ember-cli-htmlbars "^2.0.1"
-    ember-concurrency "^0.8.1"
-    ember-text-measurer "^0.3.3"
-    ember-truth-helpers "^1.3.0"
+    ember-concurrency "^0.8.12"
+    ember-text-measurer "^0.4.0"
+    ember-truth-helpers "^2.0.0"
 
 ember-qunit@^2.1.3:
   version "2.2.0"
@@ -3252,9 +3286,9 @@ ember-qunit@^2.1.3:
   dependencies:
     ember-test-helpers "^0.6.3"
 
-ember-resolver@^4.0.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-4.4.0.tgz#211ad00dea0ff2f3344aea156e556de42fc7ec74"
+ember-resolver@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-4.5.0.tgz#9248bf534dfc197fafe3118fff538d436078bf99"
   dependencies:
     "@glimmer/resolver" "^0.4.1"
     babel-plugin-debug-macros "^0.1.10"
@@ -3268,7 +3302,7 @@ ember-rfc176-data@^0.2.0:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.7.tgz#bd355bc9b473e08096b518784170a23388bc973b"
 
-ember-rfc176-data@^0.3.0:
+ember-rfc176-data@^0.3.0, ember-rfc176-data@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.1.tgz#6a5a4b8b82ec3af34f3010965fa96b936ca94519"
 
@@ -3318,17 +3352,17 @@ ember-test-helpers@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/ember-test-helpers/-/ember-test-helpers-0.6.3.tgz#f864cdf6f4e75f3f8768d6537785b5ab6e82d907"
 
-ember-text-measurer@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/ember-text-measurer/-/ember-text-measurer-0.3.3.tgz#0762809a71c2e1f2e60ab00c53c6eb1b63c9f963"
+ember-text-measurer@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/ember-text-measurer/-/ember-text-measurer-0.4.0.tgz#a676195378d4eb4c1617678c2d198a2344b4d12b"
   dependencies:
-    ember-cli-babel "^5.1.6"
+    ember-cli-babel "^6.8.2"
 
-ember-truth-helpers@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-1.3.0.tgz#6ed9f83ce9a49f52bb416d55e227426339a64c60"
+ember-truth-helpers@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-2.0.0.tgz#f3e2eef667859197f1328bb4f83b0b35b661c1ac"
   dependencies:
-    ember-cli-babel "^5.1.6"
+    ember-cli-babel "^6.8.2"
 
 ember-try-config@^2.2.0:
   version "2.2.0"
@@ -3356,11 +3390,13 @@ ember-try@^0.2.15:
     rsvp "^3.0.17"
     semver "^5.1.0"
 
-ember-weakmap@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ember-weakmap/-/ember-weakmap-2.0.0.tgz#71c6819a8bfd0b077ae17ca1d9053fc5db06e4ac"
+ember-weakmap@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/ember-weakmap/-/ember-weakmap-3.1.1.tgz#2ae6e0080b5b80cf0d108f7752dc69ea9603dbd7"
   dependencies:
-    ember-cli-babel "^5.1.6"
+    browserslist "^2.2.2"
+    debug "^3.1.0"
+    ember-cli-babel "^6.3.0"
 
 ember-welcome-page@^3.0.0:
   version "3.1.1"
@@ -3527,46 +3563,6 @@ eslint-scope@^3.7.1:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint@^3.0.0:
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
-  dependencies:
-    babel-code-frame "^6.16.0"
-    chalk "^1.1.3"
-    concat-stream "^1.5.2"
-    debug "^2.1.1"
-    doctrine "^2.0.0"
-    escope "^3.6.0"
-    espree "^3.4.0"
-    esquery "^1.0.0"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    glob "^7.0.3"
-    globals "^9.14.0"
-    ignore "^3.2.0"
-    imurmurhash "^0.1.4"
-    inquirer "^0.12.0"
-    is-my-json-valid "^2.10.0"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.5.1"
-    json-stable-stringify "^1.0.0"
-    levn "^0.3.0"
-    lodash "^4.0.0"
-    mkdirp "^0.5.0"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.1"
-    pluralize "^1.2.1"
-    progress "^1.1.8"
-    require-uncached "^1.0.2"
-    shelljs "^0.7.5"
-    strip-bom "^3.0.0"
-    strip-json-comments "~2.0.1"
-    table "^3.7.8"
-    text-table "~0.2.0"
-    user-home "^2.0.0"
-
 eslint@^4.0.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.5.0.tgz#bb75d3b8bde97fb5e13efcd539744677feb019c3"
@@ -3609,13 +3605,62 @@ eslint@^4.0.0:
     table "^4.0.1"
     text-table "~0.2.0"
 
-espree@^3.4.0, espree@^3.5.0:
+eslint@^4.13.1:
+  version "4.13.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.13.1.tgz#0055e0014464c7eb7878caf549ef2941992b444f"
+  dependencies:
+    ajv "^5.3.0"
+    babel-code-frame "^6.22.0"
+    chalk "^2.1.0"
+    concat-stream "^1.6.0"
+    cross-spawn "^5.1.0"
+    debug "^3.0.1"
+    doctrine "^2.0.2"
+    eslint-scope "^3.7.1"
+    espree "^3.5.2"
+    esquery "^1.0.0"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.0.1"
+    ignore "^3.3.3"
+    imurmurhash "^0.1.4"
+    inquirer "^3.0.6"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.9.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    pluralize "^7.0.0"
+    progress "^2.0.0"
+    require-uncached "^1.0.3"
+    semver "^5.3.0"
+    strip-ansi "^4.0.0"
+    strip-json-comments "~2.0.1"
+    table "^4.0.1"
+    text-table "~0.2.0"
+
+espree@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.0.tgz#98358625bdd055861ea27e2867ea729faf463d8d"
   dependencies:
     acorn "^5.1.1"
     acorn-jsx "^3.0.0"
 
+espree@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca"
+  dependencies:
+    acorn "^5.2.1"
+    acorn-jsx "^3.0.0"
+
 esprima-fb@~15001.1001.0-dev-harmony-fb:
   version "15001.1001.0-dev-harmony-fb"
   resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz#43beb57ec26e8cf237d3dd8b33e42533577f2659"
@@ -3830,6 +3875,10 @@ fast-deep-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
 
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
@@ -3866,7 +3915,7 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "^2.0.0"
 
-figures@^1.3.5, figures@^1.7.0:
+figures@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
   dependencies:
@@ -3920,10 +3969,6 @@ find-index@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-1.1.0.tgz#53007c79cd30040d6816d79458e8837d5c5705ef"
 
-find-parent-dir@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
-
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -3965,11 +4010,11 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
-flat@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-2.0.1.tgz#70e29188a74be0c3c89409eed1fa9577907ae32f"
+flat@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-4.0.0.tgz#3abc7f3b588e64ce77dc42fd59aa35806622fea8"
   dependencies:
-    is-buffer "~1.1.2"
+    is-buffer "~1.1.5"
 
 for-in@^1.0.1:
   version "1.0.2"
@@ -4147,16 +4192,6 @@ gaze@^1.0.0:
   dependencies:
     globule "^1.0.0"
 
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  dependencies:
-    is-property "^1.0.0"
-
 get-caller-file@^1.0.0, get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -4240,11 +4275,15 @@ global-prefix@^0.1.4:
     is-windows "^0.2.0"
     which "^1.2.12"
 
+globals@^11.0.1:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4"
+
 globals@^6.4.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/globals/-/globals-6.4.1.tgz#8498032b3b6d1cc81eebc5f79690d8fe29fabf4f"
 
-globals@^9.14.0, globals@^9.17.0, globals@^9.18.0:
+globals@^9.17.0, globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
@@ -4482,14 +4521,13 @@ https-browserify@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
 
-husky@^0.13.4:
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-0.13.4.tgz#48785c5028de3452a51c48c12c4f94b2124a1407"
+husky@^0.14.3:
+  version "0.14.3"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
   dependencies:
-    chalk "^1.1.3"
-    find-parent-dir "^0.3.0"
-    is-ci "^1.0.9"
+    is-ci "^1.0.10"
     normalize-path "^1.0.0"
+    strip-indent "^2.0.0"
 
 iconv-lite@^0.4.17, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
   version "0.4.18"
@@ -4499,7 +4537,7 @@ ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
-ignore@^3.2.0, ignore@^3.3.3:
+ignore@^3.3.3:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.4.tgz#85ab6d0a9ca8b27b31604c09efe1c14dc21ab872"
 
@@ -4568,24 +4606,6 @@ inline-source-map@~0.6.0:
   dependencies:
     source-map "~0.5.3"
 
-inquirer@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^2.0.0"
-    figures "^1.3.5"
-    lodash "^4.3.0"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
 inquirer@^2:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-2.0.0.tgz#e1351687b90d150ca403ceaa3cefb1e3065bef4b"
@@ -4637,10 +4657,6 @@ insert-module-globals@^7.0.0:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-interpret@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
-
 invariant@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
@@ -4665,11 +4681,11 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.0:
+is-buffer@^1.1.0, is-buffer@~1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
-is-buffer@^1.1.5, is-buffer@~1.1.2:
+is-buffer@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
 
@@ -4679,7 +4695,7 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
-is-ci@^1.0.9:
+is-ci@^1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
   dependencies:
@@ -4719,10 +4735,6 @@ is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
 
-is-git-url@^0.2.0:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-0.2.3.tgz#445200d6fbd6da028fb5e01440d9afc93f3ccb64"
-
 is-git-url@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
@@ -4739,15 +4751,6 @@ is-integer@^1.0.4:
   dependencies:
     is-finite "^1.0.0"
 
-is-my-json-valid@^2.10.0:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -4792,10 +4795,6 @@ is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-
 is-resolvable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
@@ -4878,7 +4877,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.6.1, js-yaml@^3.9.1:
+js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.4.3, js-yaml@^3.6.1, js-yaml@^3.9.1:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
   dependencies:
@@ -4928,6 +4927,10 @@ json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
 
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+
 json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
@@ -4976,10 +4979,6 @@ jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
 
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -5436,7 +5435,7 @@ lodash.memoize@~3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
 
-lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.5.1, lodash.merge@^4.6.0:
+lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
 
@@ -5620,6 +5619,12 @@ matcher-collection@^1.0.0:
   dependencies:
     minimatch "^3.0.2"
 
+matcher-collection@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.0.5.tgz#2ee095438372cb8884f058234138c05c644ec339"
+  dependencies:
+    minimatch "^3.0.2"
+
 md5-hex@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4"
@@ -5814,9 +5819,9 @@ module-deps@^4.0.8:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-moment-timezone@~0.5.11:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.13.tgz#99ce5c7d827262eb0f1f702044177f60745d7b90"
+moment-timezone@^0.5.13:
+  version "0.5.14"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.14.tgz#4eb38ff9538b80108ba467a458f3ed4268ccfcb1"
   dependencies:
     moment ">= 2.9.0"
 
@@ -5854,10 +5859,6 @@ mustache@^2.2.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0"
 
-mute-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
-
 mute-stream@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db"
@@ -5889,9 +5890,9 @@ node-fetch@^1.3.3:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-fetch@^2.0.0-alpha.3:
-  version "2.0.0-alpha.8"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.0.0-alpha.8.tgz#f586cf6730ce30431c7d4528ce561d81add8ba90"
+node-fetch@^2.0.0-alpha.9:
+  version "2.0.0-alpha.9"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.0.0-alpha.9.tgz#990c0634f510f76449a0d6f6eaec96b22f273628"
 
 node-gyp@^3.3.1:
   version "3.6.2"
@@ -6352,14 +6353,14 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
-pluralize@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
-
 pluralize@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-4.0.0.tgz#59b708c1c0190a2f692f1c7618c446b052fd1762"
 
+pluralize@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+
 portfinder@^1.0.7:
   version "1.0.13"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
@@ -6409,10 +6410,6 @@ process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
-progress@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-
 progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
@@ -6465,8 +6462,8 @@ qs@~6.4.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
 query-string@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.0.0.tgz#fbdf7004b4d2aff792f9871981b7a2794f555947"
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.0.1.tgz#6e2b86fe0e08aef682ecbe86e85834765402bd88"
   dependencies:
     decode-uri-component "^0.2.0"
     object-assign "^4.1.0"
@@ -6621,14 +6618,6 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
-readline2@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    mute-stream "0.0.5"
-
 recast@0.10.33, recast@^0.10.10:
   version "0.10.33"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
@@ -6647,12 +6636,6 @@ recast@^0.11.17, recast@^0.11.3:
     private "~0.1.5"
     source-map "~0.5.0"
 
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  dependencies:
-    resolve "^1.1.6"
-
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -6799,7 +6782,7 @@ require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
-require-uncached@^1.0.2, require-uncached@^1.0.3:
+require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
   dependencies:
@@ -6837,7 +6820,7 @@ resolve@^1.1.2, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.0, resolve@^1.3.3,
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.1.3, resolve@^1.1.4:
+resolve@^1.1.3, resolve@^1.1.4, resolve@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
   dependencies:
@@ -6898,7 +6881,7 @@ rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
 
-rsvp@^4.7.0:
+rsvp@^4.6.1, rsvp@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.7.0.tgz#dc1b0b1a536f7dec9d2be45e0a12ad4197c9fd96"
 
@@ -6910,12 +6893,6 @@ rsvp@~3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
 
-run-async@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
-  dependencies:
-    once "^1.3.0"
-
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -6932,10 +6909,6 @@ rx-lite@*, rx-lite@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
 
-rx-lite@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
-
 rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
@@ -6994,10 +6967,6 @@ scss-tokenizer@^0.2.3:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
-semver@^4.1.0:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -7074,14 +7043,6 @@ shell-quote@^1.6.1:
     array-reduce "~0.0.0"
     jsonify "~0.0.0"
 
-shelljs@^0.7.5:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 shellwords@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
@@ -7207,6 +7168,10 @@ source-map-url@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
 
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+
 source-map@0.1.32, source-map@~0.1.x:
   version "0.1.32"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266"
@@ -7223,6 +7188,10 @@ source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, sour
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
+source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
 sourcemap-validator@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sourcemap-validator/-/sourcemap-validator-1.0.5.tgz#f9b960f48c6469e288a19af305f005da3dc1df3a"
@@ -7419,6 +7388,10 @@ strip-indent@^1.0.1:
   dependencies:
     get-stdin "^4.0.1"
 
+strip-indent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -7479,17 +7452,6 @@ syntax-error@^1.1.1:
   dependencies:
     acorn "^4.0.3"
 
-table@^3.7.8:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
-  dependencies:
-    ajv "^4.7.0"
-    ajv-keywords "^1.0.0"
-    chalk "^1.1.1"
-    lodash "^4.0.0"
-    slice-ansi "0.0.4"
-    string-width "^2.0.0"
-
 table@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"
@@ -7718,7 +7680,14 @@ uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
 
-uglify-js@^2.6, uglify-js@^2.7.0:
+uglify-es@^3.1.3:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.2.2.tgz#15c62b7775002c81b7987a1c49ecd3f126cace73"
+  dependencies:
+    commander "~2.12.1"
+    source-map "~0.6.1"
+
+uglify-js@^2.6:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
@@ -7785,12 +7754,6 @@ user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
 
-user-home@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
-  dependencies:
-    os-homedir "^1.0.0"
-
 username-sync@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.1.tgz#1cde87eefcf94b8822984d938ba2b797426dae1f"
@@ -7862,7 +7825,7 @@ walk-sync@^0.2.5, walk-sync@^0.2.7:
     ensure-posix-path "^1.0.0"
     matcher-collection "^1.0.0"
 
-walk-sync@^0.3.0, walk-sync@^0.3.1:
+walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.2.tgz#4827280afc42d0e035367c4a4e31eeac0d136f75"
   dependencies:

From 8100dc94e472757eef3a96018e91c593c9351fa6 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 13 Dec 2017 11:03:11 -0800
Subject: [PATCH 11/48] Update the reason why the router service is still not
 used

---
 ui/app/components/server-agent-row.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/app/components/server-agent-row.js b/ui/app/components/server-agent-row.js
index f853ada96..4ad41ee93 100644
--- a/ui/app/components/server-agent-row.js
+++ b/ui/app/components/server-agent-row.js
@@ -4,7 +4,8 @@ import { lazyClick } from '../helpers/lazy-click';
 const { Component, inject, computed } = Ember;
 
 export default Component.extend({
-  // TODO Switch back to the router service style when it is no longer feature-flagged
+  // TODO Switch back to the router service once the service behaves more like Route
+  // https://github.com/emberjs/ember.js/issues/15801
   // router: inject.service('router'),
   _router: inject.service('-routing'),
   router: computed.alias('_router.router'),
@@ -15,7 +16,8 @@ export default Component.extend({
 
   agent: null,
   isActive: computed('agent', 'router.currentURL', function() {
-    // TODO Switch back to the router service style when it is no longer feature-flagged
+    // TODO Switch back to the router service once the service behaves more like Route
+    // https://github.com/emberjs/ember.js/issues/15801
     // const targetURL = this.get('router').urlFor('servers.server', this.get('agent'));
     // const currentURL = `${this.get('router.rootURL').slice(0, -1)}${this.get('router.currentURL')}`;
 

From 46783e18132e8b896b291eeeb60f402b2b5852ec Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 13 Dec 2017 16:21:44 -0800
Subject: [PATCH 12/48] Run ember out of node_modules

This locks the version to what's described in package.json
---
 ui/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index 90e888938..f8162239a 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -8,9 +8,9 @@
   },
   "repository": "",
   "scripts": {
-    "build": "ember build -prod",
-    "start": "ember server --proxy=http://127.0.0.1:4646",
-    "test": "ember test",
+    "build": "./node_modules/ember-cli/bin/ember build -prod",
+    "start": "./node_modules/ember-cli/bin/ember server",
+    "test": "./node_modules/ember-cli/bin/ember test",
     "precommit": "lint-staged"
   },
   "lint-staged": {

From ab5cec4e1bbf3bdfd25d7c1475a0e721a7c7ba60 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 13 Dec 2017 17:04:15 -0800
Subject: [PATCH 13/48] Lock down yarn version

---
 .travis.yml | 6 ++----
 GNUmakefile | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 258b59a16..3a9791d32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,13 +28,11 @@ matrix:
     - os: osx
   fast_finish: true
 
-cache:
-  directories:
-    - ui/node_modules
-
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ -z "$SKIP_NOMAD_TESTS" ]]; then sudo -E bash ./scripts/travis-mac-priv.sh ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ -z "$SKIP_NOMAD_TESTS" ]]; then sudo -E bash ./scripts/travis-linux.sh ; fi
+  - if [[ "$RUN_UI_TESTS" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.1 ; fi
+  - if [[ "$RUN_UI_TESTS" ]]; then export PATH="$HOME/.yarn/bin:$PATH" ; fi
 
 install:
   - if [[ -z "$SKIP_NOMAD_TESTS" ]]; then make deps ; fi
diff --git a/GNUmakefile b/GNUmakefile
index 3c9741a71..951e7a81b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -283,8 +283,8 @@ static-assets: ## Compile the static routes to serve alongside the API
 .PHONY: test-ui
 test-ui: ## Run Nomad UI test suite
 	@echo "--> Installing JavaScript assets"
+	@cd ui && npm rebuild node-sass
 	@cd ui && yarn install
-	@cd ui && npm install phantomjs-prebuilt
 	@echo "--> Running ember tests"
 	@cd ui && phantomjs --version
 	@cd ui && npm test

From 2e19c2d8774699753f152e754deae8a484137e75 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Fri, 15 Dec 2017 13:39:18 -0800
Subject: [PATCH 14/48] Use the new ember modules imports

Generated with a codemode:
https://github.com/ember-cli/ember-modules-codemod
---
 ui/app/adapters/application.js                |  7 +++---
 ui/app/adapters/job.js                        |  8 +++---
 ui/app/adapters/token.js                      |  6 ++---
 ui/app/app.js                                 |  5 ++--
 ui/app/components/allocation-row.js           |  8 +++---
 ui/app/components/allocation-status-bar.js    |  4 +--
 ui/app/components/attributes-section.js       |  4 +--
 ui/app/components/client-node-row.js          |  4 +--
 ui/app/components/distribution-bar.js         |  7 ++++--
 ui/app/components/gutter-menu.js              |  8 +++---
 ui/app/components/job-deployment.js           |  4 +--
 .../job-deployment/deployment-metrics.js      |  4 +--
 ui/app/components/job-deployments-stream.js   |  5 ++--
 .../components/job-diff-fields-and-objects.js |  4 +--
 ui/app/components/job-diff.js                 | 11 ++++----
 ui/app/components/job-row.js                  |  4 +--
 ui/app/components/job-version.js              |  5 ++--
 ui/app/components/job-versions-stream.js      |  5 ++--
 ui/app/components/json-viewer.js              |  6 ++---
 ui/app/components/list-pagination.js          | 13 +++++-----
 .../components/list-pagination/list-pager.js  |  4 +--
 ui/app/components/list-table.js               |  5 ++--
 ui/app/components/list-table/sort-by.js       |  5 ++--
 ui/app/components/list-table/table-body.js    |  4 +--
 ui/app/components/list-table/table-head.js    |  4 +--
 ui/app/components/search-box.js               |  8 +++---
 ui/app/components/server-agent-row.js         | 11 ++++----
 ui/app/components/task-group-row.js           |  4 +--
 ui/app/components/task-log.js                 |  9 ++++---
 ui/app/controllers/allocations/allocation.js  |  4 +--
 .../allocations/allocation/index.js           |  9 +++----
 .../allocations/allocation/task/index.js      |  8 +++---
 ui/app/controllers/application.js             |  8 +++---
 ui/app/controllers/clients.js                 |  4 +--
 ui/app/controllers/clients/client.js          | 12 ++++-----
 ui/app/controllers/clients/index.js           | 20 +++++++--------
 ui/app/controllers/freestyle.js               |  7 +++---
 ui/app/controllers/jobs.js                    |  9 ++++---
 ui/app/controllers/jobs/index.js              | 25 ++++++++++---------
 ui/app/controllers/jobs/job.js                |  5 ++--
 ui/app/controllers/jobs/job/definition.js     | 11 ++++----
 ui/app/controllers/jobs/job/deployments.js    | 13 +++++-----
 ui/app/controllers/jobs/job/index.js          | 19 +++++++-------
 ui/app/controllers/jobs/job/loading.js        |  9 +++----
 ui/app/controllers/jobs/job/task-group.js     | 14 +++++------
 ui/app/controllers/jobs/job/versions.js       | 13 +++++-----
 ui/app/controllers/servers.js                 | 13 +++++-----
 ui/app/controllers/servers/index.js           |  9 +++----
 ui/app/controllers/servers/server.js          |  5 ++--
 ui/app/controllers/settings/tokens.js         | 13 +++++-----
 ui/app/helpers/css-class.js                   |  4 +--
 ui/app/helpers/format-bytes.js                |  4 +--
 ui/app/helpers/format-percentage.js           |  4 +--
 ui/app/helpers/is-object.js                   |  4 +--
 ui/app/helpers/lazy-click.js                  |  5 ++--
 ui/app/helpers/pluralize.js                   |  4 +--
 ui/app/helpers/x-icon.js                      |  4 +--
 ui/app/mixins/searchable.js                   |  5 ++--
 ui/app/mixins/sortable.js                     |  5 ++--
 ui/app/mixins/window-resizable.js             |  8 +++---
 ui/app/mixins/with-forbidden-state.js         |  4 +--
 ui/app/mixins/with-model-error-handling.js    |  4 +--
 ui/app/mixins/with-namespace-resetting.js     | 10 ++++----
 ui/app/models/agent.js                        |  7 +++---
 ui/app/models/allocation.js                   | 11 ++++----
 ui/app/models/deployment.js                   |  7 +++---
 ui/app/models/evaluation.js                   |  6 ++---
 ui/app/models/job.js                          | 13 +++++-----
 ui/app/models/namespace.js                    |  6 ++---
 ui/app/models/node-attributes.js              | 13 +++++-----
 ui/app/models/node.js                         |  4 +--
 ui/app/models/task-event.js                   |  3 +--
 .../models/task-group-deployment-summary.js   |  6 ++---
 ui/app/models/task-group-summary.js           |  8 +++---
 ui/app/models/task-group.js                   |  4 +--
 ui/app/models/task-state.js                   |  7 +++---
 ui/app/models/token.js                        |  6 ++---
 ui/app/router.js                              |  4 +--
 ui/app/routes/allocations/allocation.js       |  4 +--
 ui/app/routes/allocations/allocation/task.js  |  8 +++---
 .../allocations/allocation/task/logs.js       |  4 +--
 ui/app/routes/application.js                  |  7 +++---
 ui/app/routes/clients.js                      | 10 ++++----
 ui/app/routes/clients/client.js               |  7 +++---
 ui/app/routes/index.js                        |  4 +--
 ui/app/routes/jobs.js                         | 10 ++++----
 ui/app/routes/jobs/index.js                   |  4 +--
 ui/app/routes/jobs/job.js                     |  8 +++---
 ui/app/routes/jobs/job/definition.js          |  4 +--
 ui/app/routes/jobs/job/deployments.js         |  5 ++--
 ui/app/routes/jobs/job/task-group.js          |  4 +--
 ui/app/routes/jobs/job/versions.js            |  4 +--
 ui/app/routes/not-found.js                    |  5 ++--
 ui/app/routes/servers.js                      | 10 ++++----
 ui/app/routes/servers/server.js               |  4 +--
 ui/app/serializers/allocation.js              |  7 +++---
 ui/app/serializers/application.js             |  4 +--
 ui/app/serializers/deployment.js              |  5 ++--
 ui/app/serializers/evaluation.js              |  8 +++---
 ui/app/serializers/job-version.js             |  4 +--
 ui/app/serializers/job.js                     |  5 ++--
 ui/app/serializers/node.js                    |  6 ++---
 ui/app/serializers/task-group.js              |  4 +--
 ui/app/serializers/token.js                   |  4 +--
 ui/app/services/config.js                     | 12 ++++-----
 ui/app/services/system.js                     |  9 +++----
 ui/app/services/token.js                      |  6 ++---
 ui/app/utils/classes/abstract-logger.js       | 10 ++++----
 ui/app/utils/classes/log.js                   | 14 +++++------
 ui/app/utils/classes/poll-logger.js           |  4 +--
 ui/app/utils/classes/promise-object.js        |  5 ++--
 ui/app/utils/classes/stream-logger.js         |  4 +--
 ui/app/utils/properties/short-uuid.js         |  4 +--
 ui/app/utils/properties/style-string.js       |  4 +--
 ui/app/utils/properties/sum-aggregation.js    |  8 +++---
 ui/app/utils/timeout.js                       |  4 +--
 ui/tests/acceptance/allocation-detail-test.js |  4 +--
 ui/tests/acceptance/client-detail-test.js     |  4 +--
 ui/tests/acceptance/job-deployments-test.js   |  4 +--
 ui/tests/acceptance/job-detail-test.js        |  4 +--
 ui/tests/acceptance/job-versions-test.js      |  4 +--
 ui/tests/acceptance/jobs-list-test.js         |  4 +--
 ui/tests/acceptance/nodes-list-test.js        |  4 +--
 ui/tests/acceptance/server-detail-test.js     |  4 +--
 ui/tests/acceptance/task-detail-test.js       |  4 +--
 ui/tests/acceptance/task-group-detail-test.js |  4 +--
 ui/tests/acceptance/task-logs-test.js         |  4 +--
 ui/tests/acceptance/token-test.js             |  4 +--
 ui/tests/helpers/destroy-app.js               |  4 +--
 ui/tests/helpers/module-for-acceptance.js     |  4 +--
 ui/tests/helpers/module-for-serializer.js     |  4 +--
 ui/tests/helpers/start-app.js                 |  9 ++++---
 ui/tests/integration/task-log-test.js         |  4 +--
 ui/tests/unit/mixins/searchable-test.js       | 10 ++++----
 ui/tests/unit/models/task-group-test.js       |  3 +--
 ui/tests/unit/utils/log-test.js               |  6 ++---
 136 files changed, 384 insertions(+), 517 deletions(-)

diff --git a/ui/app/adapters/application.js b/ui/app/adapters/application.js
index 1e5c97333..bcf223383 100644
--- a/ui/app/adapters/application.js
+++ b/ui/app/adapters/application.js
@@ -1,15 +1,14 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import { computed, get } from '@ember/object';
 import RESTAdapter from 'ember-data/adapters/rest';
 import codesForError from '../utils/codes-for-error';
 
-const { get, computed, inject } = Ember;
-
 export const namespace = 'v1';
 
 export default RESTAdapter.extend({
   namespace,
 
-  token: inject.service(),
+  token: service(),
 
   headers: computed('token.secret', function() {
     const token = this.get('token.secret');
diff --git a/ui/app/adapters/job.js b/ui/app/adapters/job.js
index 4d18d1625..80398adac 100644
--- a/ui/app/adapters/job.js
+++ b/ui/app/adapters/job.js
@@ -1,10 +1,10 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import RSVP from 'rsvp';
+import { assign } from '@ember/polyfills';
 import ApplicationAdapter from './application';
 
-const { RSVP, inject, assign } = Ember;
-
 export default ApplicationAdapter.extend({
-  system: inject.service(),
+  system: service(),
 
   shouldReloadAll: () => true,
 
diff --git a/ui/app/adapters/token.js b/ui/app/adapters/token.js
index 0bd103334..32315037a 100644
--- a/ui/app/adapters/token.js
+++ b/ui/app/adapters/token.js
@@ -1,10 +1,8 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
 import { default as ApplicationAdapter, namespace } from './application';
 
-const { inject } = Ember;
-
 export default ApplicationAdapter.extend({
-  store: inject.service(),
+  store: service(),
 
   namespace: namespace + '/acl',
 
diff --git a/ui/app/app.js b/ui/app/app.js
index 831ad6106..c5fb686f8 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -1,3 +1,4 @@
+import Application from '@ember/application';
 import Ember from 'ember';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
@@ -7,10 +8,10 @@ let App;
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
-App = Ember.Application.extend({
+App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
-  Resolver
+  Resolver,
 });
 
 loadInitializers(App, config.modulePrefix);
diff --git a/ui/app/components/allocation-row.js b/ui/app/components/allocation-row.js
index a258f5b24..5625c092f 100644
--- a/ui/app/components/allocation-row.js
+++ b/ui/app/components/allocation-row.js
@@ -1,10 +1,10 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
+import { run } from '@ember/runloop';
 import { lazyClick } from '../helpers/lazy-click';
 
-const { Component, inject, run } = Ember;
-
 export default Component.extend({
-  store: inject.service(),
+  store: service(),
 
   tagName: 'tr',
 
diff --git a/ui/app/components/allocation-status-bar.js b/ui/app/components/allocation-status-bar.js
index 0a3734626..7f2d1e2fc 100644
--- a/ui/app/components/allocation-status-bar.js
+++ b/ui/app/components/allocation-status-bar.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
 import DistributionBar from './distribution-bar';
 
-const { computed } = Ember;
-
 export default DistributionBar.extend({
   layoutName: 'components/distribution-bar',
 
diff --git a/ui/app/components/attributes-section.js b/ui/app/components/attributes-section.js
index f2503c9fc..479865264 100644
--- a/ui/app/components/attributes-section.js
+++ b/ui/app/components/attributes-section.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   tagName: '',
diff --git a/ui/app/components/client-node-row.js b/ui/app/components/client-node-row.js
index e2f9dd19c..2775ed58f 100644
--- a/ui/app/components/client-node-row.js
+++ b/ui/app/components/client-node-row.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import { lazyClick } from '../helpers/lazy-click';
 
-const { Component } = Ember;
-
 export default Component.extend({
   tagName: 'tr',
   classNames: ['client-node-row', 'is-interactive'],
diff --git a/ui/app/components/distribution-bar.js b/ui/app/components/distribution-bar.js
index 105273df6..8c171b11b 100644
--- a/ui/app/components/distribution-bar.js
+++ b/ui/app/components/distribution-bar.js
@@ -1,10 +1,13 @@
-import Ember from 'ember';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { run } from '@ember/runloop';
+import { assign } from '@ember/polyfills';
+import { guidFor } from '@ember/object/internals';
 import d3 from 'npm:d3-selection';
 import 'npm:d3-transition';
 import WindowResizable from '../mixins/window-resizable';
 import styleStringProperty from '../utils/properties/style-string';
 
-const { Component, computed, run, assign, guidFor } = Ember;
 const sumAggregate = (total, val) => total + val;
 
 export default Component.extend(WindowResizable, {
diff --git a/ui/app/components/gutter-menu.js b/ui/app/components/gutter-menu.js
index 9ab098cbb..7a5086b76 100644
--- a/ui/app/components/gutter-menu.js
+++ b/ui/app/components/gutter-menu.js
@@ -1,9 +1,9 @@
-import Ember from 'ember';
-
-const { Component, inject, computed } = Ember;
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 
 export default Component.extend({
-  system: inject.service(),
+  system: service(),
 
   sortedNamespaces: computed('system.namespaces.@each.name', function() {
     const namespaces = this.get('system.namespaces').toArray() || [];
diff --git a/ui/app/components/job-deployment.js b/ui/app/components/job-deployment.js
index 1a2476be8..feb13f17d 100644
--- a/ui/app/components/job-deployment.js
+++ b/ui/app/components/job-deployment.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   classNames: ['job-deployment', 'boxed-section'],
diff --git a/ui/app/components/job-deployment/deployment-metrics.js b/ui/app/components/job-deployment/deployment-metrics.js
index f2503c9fc..479865264 100644
--- a/ui/app/components/job-deployment/deployment-metrics.js
+++ b/ui/app/components/job-deployment/deployment-metrics.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   tagName: '',
diff --git a/ui/app/components/job-deployments-stream.js b/ui/app/components/job-deployments-stream.js
index 65b700491..0ddb5fedb 100644
--- a/ui/app/components/job-deployments-stream.js
+++ b/ui/app/components/job-deployments-stream.js
@@ -1,8 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 import moment from 'moment';
 
-const { Component, computed } = Ember;
-
 export default Component.extend({
   tagName: 'ol',
   classNames: ['timeline'],
diff --git a/ui/app/components/job-diff-fields-and-objects.js b/ui/app/components/job-diff-fields-and-objects.js
index f2503c9fc..479865264 100644
--- a/ui/app/components/job-diff-fields-and-objects.js
+++ b/ui/app/components/job-diff-fields-and-objects.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   tagName: '',
diff --git a/ui/app/components/job-diff.js b/ui/app/components/job-diff.js
index 2bba7310e..79371f333 100644
--- a/ui/app/components/job-diff.js
+++ b/ui/app/components/job-diff.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Component, computed } = Ember;
+import { equal } from '@ember/object/computed';
+import Component from '@ember/component';
 
 export default Component.extend({
   classNames: ['job-diff'],
@@ -10,7 +9,7 @@ export default Component.extend({
 
   verbose: true,
 
-  isEdited: computed.equal('diff.Type', 'Edited'),
-  isAdded: computed.equal('diff.Type', 'Added'),
-  isDeleted: computed.equal('diff.Type', 'Deleted'),
+  isEdited: equal('diff.Type', 'Edited'),
+  isAdded: equal('diff.Type', 'Added'),
+  isDeleted: equal('diff.Type', 'Deleted'),
 });
diff --git a/ui/app/components/job-row.js b/ui/app/components/job-row.js
index e370cfba9..db9e6e369 100644
--- a/ui/app/components/job-row.js
+++ b/ui/app/components/job-row.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import { lazyClick } from '../helpers/lazy-click';
 
-const { Component } = Ember;
-
 export default Component.extend({
   tagName: 'tr',
   classNames: ['job-row', 'is-interactive'],
diff --git a/ui/app/components/job-version.js b/ui/app/components/job-version.js
index 0ffe77803..978111a93 100644
--- a/ui/app/components/job-version.js
+++ b/ui/app/components/job-version.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Component, computed } = Ember;
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 
 const changeTypes = ['Added', 'Deleted', 'Edited'];
 
diff --git a/ui/app/components/job-versions-stream.js b/ui/app/components/job-versions-stream.js
index 8ac011376..b2a92d71a 100644
--- a/ui/app/components/job-versions-stream.js
+++ b/ui/app/components/job-versions-stream.js
@@ -1,8 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 import moment from 'moment';
 
-const { Component, computed } = Ember;
-
 export default Component.extend({
   tagName: 'ol',
   classNames: ['timeline'],
diff --git a/ui/app/components/json-viewer.js b/ui/app/components/json-viewer.js
index 2d8442e33..cf966757d 100644
--- a/ui/app/components/json-viewer.js
+++ b/ui/app/components/json-viewer.js
@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { run } from '@ember/runloop';
 import JSONFormatterPkg from 'npm:json-formatter-js';
 
-const { Component, computed, run } = Ember;
-
 // json-formatter-js is packaged in a funny way that ember-cli-browserify
 // doesn't unwrap properly.
 const { default: JSONFormatter } = JSONFormatterPkg;
diff --git a/ui/app/components/list-pagination.js b/ui/app/components/list-pagination.js
index c18301d4a..c04aaa9f4 100644
--- a/ui/app/components/list-pagination.js
+++ b/ui/app/components/list-pagination.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Component, computed } = Ember;
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 
 export default Component.extend({
   source: computed(() => []),
@@ -31,9 +30,11 @@ export default Component.extend({
     const lowerBound = Math.max(1, page - spread);
     const upperBound = Math.min(lastPage, page + spread) + 1;
 
-    return Array(upperBound - lowerBound).fill(null).map((_, index) => ({
-      pageNumber: lowerBound + index,
-    }));
+    return Array(upperBound - lowerBound)
+      .fill(null)
+      .map((_, index) => ({
+        pageNumber: lowerBound + index,
+      }));
   }),
 
   list: computed('source.[]', 'page', 'size', function() {
diff --git a/ui/app/components/list-pagination/list-pager.js b/ui/app/components/list-pagination/list-pager.js
index f2503c9fc..479865264 100644
--- a/ui/app/components/list-pagination/list-pager.js
+++ b/ui/app/components/list-pagination/list-pager.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   tagName: '',
diff --git a/ui/app/components/list-table.js b/ui/app/components/list-table.js
index 39cf15fe6..0b6d63416 100644
--- a/ui/app/components/list-table.js
+++ b/ui/app/components/list-table.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Component, computed } = Ember;
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 
 export default Component.extend({
   tagName: 'table',
diff --git a/ui/app/components/list-table/sort-by.js b/ui/app/components/list-table/sort-by.js
index 9edcb61e7..cd6e3fc2c 100644
--- a/ui/app/components/list-table/sort-by.js
+++ b/ui/app/components/list-table/sort-by.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Component, computed } = Ember;
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 
 export default Component.extend({
   tagName: 'th',
diff --git a/ui/app/components/list-table/table-body.js b/ui/app/components/list-table/table-body.js
index 4c756a699..782917851 100644
--- a/ui/app/components/list-table/table-body.js
+++ b/ui/app/components/list-table/table-body.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   tagName: 'tbody',
diff --git a/ui/app/components/list-table/table-head.js b/ui/app/components/list-table/table-head.js
index c1f0c7825..92a17d670 100644
--- a/ui/app/components/list-table/table-head.js
+++ b/ui/app/components/list-table/table-head.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   tagName: 'thead',
diff --git a/ui/app/components/search-box.js b/ui/app/components/search-box.js
index 19aa76bef..8066f3e0b 100644
--- a/ui/app/components/search-box.js
+++ b/ui/app/components/search-box.js
@@ -1,13 +1,13 @@
-import Ember from 'ember';
-
-const { Component, computed, run } = Ember;
+import { reads } from '@ember/object/computed';
+import Component from '@ember/component';
+import { run } from '@ember/runloop';
 
 export default Component.extend({
   // Passed to the component (mutable)
   searchTerm: null,
 
   // Used as a debounce buffer
-  _searchTerm: computed.reads('searchTerm'),
+  _searchTerm: reads('searchTerm'),
 
   // Used to throttle sets to searchTerm
   debounce: 150,
diff --git a/ui/app/components/server-agent-row.js b/ui/app/components/server-agent-row.js
index 4ad41ee93..98d401fe0 100644
--- a/ui/app/components/server-agent-row.js
+++ b/ui/app/components/server-agent-row.js
@@ -1,14 +1,15 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import { alias } from '@ember/object/computed';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 import { lazyClick } from '../helpers/lazy-click';
 
-const { Component, inject, computed } = Ember;
-
 export default Component.extend({
   // TODO Switch back to the router service once the service behaves more like Route
   // https://github.com/emberjs/ember.js/issues/15801
   // router: inject.service('router'),
-  _router: inject.service('-routing'),
-  router: computed.alias('_router.router'),
+  _router: service('-routing'),
+  router: alias('_router.router'),
 
   tagName: 'tr',
   classNames: ['server-agent-row', 'is-interactive'],
diff --git a/ui/app/components/task-group-row.js b/ui/app/components/task-group-row.js
index 4fb239637..98753d615 100644
--- a/ui/app/components/task-group-row.js
+++ b/ui/app/components/task-group-row.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import { lazyClick } from '../helpers/lazy-click';
 
-const { Component } = Ember;
-
 export default Component.extend({
   tagName: 'tr',
 
diff --git a/ui/app/components/task-log.js b/ui/app/components/task-log.js
index 1b066db73..277023859 100644
--- a/ui/app/components/task-log.js
+++ b/ui/app/components/task-log.js
@@ -1,12 +1,13 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { run } from '@ember/runloop';
 import { task } from 'ember-concurrency';
 import { logger } from 'nomad-ui/utils/classes/log';
 import WindowResizable from 'nomad-ui/mixins/window-resizable';
 
-const { Component, computed, inject, run } = Ember;
-
 export default Component.extend(WindowResizable, {
-  token: inject.service(),
+  token: service(),
 
   classNames: ['boxed-section', 'task-log'],
 
diff --git a/ui/app/controllers/allocations/allocation.js b/ui/app/controllers/allocations/allocation.js
index 1ee88420b..75ceaaec3 100644
--- a/ui/app/controllers/allocations/allocation.js
+++ b/ui/app/controllers/allocations/allocation.js
@@ -1,5 +1,3 @@
-import Ember from 'ember';
-
-const { Controller } = Ember;
+import Controller from '@ember/controller';
 
 export default Controller.extend({});
diff --git a/ui/app/controllers/allocations/allocation/index.js b/ui/app/controllers/allocations/allocation/index.js
index 5a764f2a6..810d0f728 100644
--- a/ui/app/controllers/allocations/allocation/index.js
+++ b/ui/app/controllers/allocations/allocation/index.js
@@ -1,8 +1,7 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import Controller from '@ember/controller';
 import Sortable from 'nomad-ui/mixins/sortable';
 
-const { Controller, computed } = Ember;
-
 export default Controller.extend(Sortable, {
   queryParams: {
     sortProperty: 'sort',
@@ -12,6 +11,6 @@ export default Controller.extend(Sortable, {
   sortProperty: 'name',
   sortDescending: false,
 
-  listToSort: computed.alias('model.states'),
-  sortedStates: computed.alias('listSorted'),
+  listToSort: alias('model.states'),
+  sortedStates: alias('listSorted'),
 });
diff --git a/ui/app/controllers/allocations/allocation/task/index.js b/ui/app/controllers/allocations/allocation/task/index.js
index 7374af8fd..790e190ec 100644
--- a/ui/app/controllers/allocations/allocation/task/index.js
+++ b/ui/app/controllers/allocations/allocation/task/index.js
@@ -1,9 +1,9 @@
-import Ember from 'ember';
-
-const { Controller, computed } = Ember;
+import { alias } from '@ember/object/computed';
+import Controller from '@ember/controller';
+import { computed } from '@ember/object';
 
 export default Controller.extend({
-  network: computed.alias('model.resources.networks.firstObject'),
+  network: alias('model.resources.networks.firstObject'),
   ports: computed('network.reservedPorts.[]', 'network.dynamicPorts.[]', function() {
     return (this.get('network.reservedPorts') || [])
       .map(port => ({
diff --git a/ui/app/controllers/application.js b/ui/app/controllers/application.js
index faa744e96..fc3c5e58e 100644
--- a/ui/app/controllers/application.js
+++ b/ui/app/controllers/application.js
@@ -1,10 +1,12 @@
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
+import { run } from '@ember/runloop';
+import { observer, computed } from '@ember/object';
 import Ember from 'ember';
 import codesForError from '../utils/codes-for-error';
 
-const { Controller, computed, inject, run, observer } = Ember;
-
 export default Controller.extend({
-  config: inject.service(),
+  config: service(),
 
   error: null,
 
diff --git a/ui/app/controllers/clients.js b/ui/app/controllers/clients.js
index 41e5c9e2f..f4d0631dc 100644
--- a/ui/app/controllers/clients.js
+++ b/ui/app/controllers/clients.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Controller } = Ember;
+import Controller from '@ember/controller';
 
 export default Controller.extend({
   isForbidden: false,
diff --git a/ui/app/controllers/clients/client.js b/ui/app/controllers/clients/client.js
index ed463e813..008169f5e 100644
--- a/ui/app/controllers/clients/client.js
+++ b/ui/app/controllers/clients/client.js
@@ -1,9 +1,9 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import Controller from '@ember/controller';
+import { computed } from '@ember/object';
 import Sortable from 'nomad-ui/mixins/sortable';
 import Searchable from 'nomad-ui/mixins/searchable';
 
-const { Controller, computed } = Ember;
-
 export default Controller.extend(Sortable, Searchable, {
   queryParams: {
     currentPage: 'page',
@@ -20,9 +20,9 @@ export default Controller.extend(Sortable, Searchable, {
 
   searchProps: computed(() => ['shortId', 'name']),
 
-  listToSort: computed.alias('model.allocations'),
-  listToSearch: computed.alias('listSorted'),
-  sortedAllocations: computed.alias('listSearched'),
+  listToSort: alias('model.allocations'),
+  listToSearch: alias('listSorted'),
+  sortedAllocations: alias('listSearched'),
 
   actions: {
     gotoAllocation(allocation) {
diff --git a/ui/app/controllers/clients/index.js b/ui/app/controllers/clients/index.js
index eedb9ebe8..ac19f9d9d 100644
--- a/ui/app/controllers/clients/index.js
+++ b/ui/app/controllers/clients/index.js
@@ -1,14 +1,14 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import Controller, { inject as controller } from '@ember/controller';
+import { computed } from '@ember/object';
 import Sortable from 'nomad-ui/mixins/sortable';
 import Searchable from 'nomad-ui/mixins/searchable';
 
-const { Controller, computed, inject } = Ember;
-
 export default Controller.extend(Sortable, Searchable, {
-  clientsController: inject.controller('clients'),
+  clientsController: controller('clients'),
 
-  nodes: computed.alias('model.nodes'),
-  agents: computed.alias('model.agents'),
+  nodes: alias('model.nodes'),
+  agents: alias('model.agents'),
 
   queryParams: {
     currentPage: 'page',
@@ -25,11 +25,11 @@ export default Controller.extend(Sortable, Searchable, {
 
   searchProps: computed(() => ['id', 'name', 'datacenter']),
 
-  listToSort: computed.alias('nodes'),
-  listToSearch: computed.alias('listSorted'),
-  sortedNodes: computed.alias('listSearched'),
+  listToSort: alias('nodes'),
+  listToSearch: alias('listSorted'),
+  sortedNodes: alias('listSearched'),
 
-  isForbidden: computed.alias('clientsController.isForbidden'),
+  isForbidden: alias('clientsController.isForbidden'),
 
   actions: {
     gotoNode(node) {
diff --git a/ui/app/controllers/freestyle.js b/ui/app/controllers/freestyle.js
index 71e5bde38..552795608 100644
--- a/ui/app/controllers/freestyle.js
+++ b/ui/app/controllers/freestyle.js
@@ -1,10 +1,9 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import { computed } from '@ember/object';
 import FreestyleController from 'ember-freestyle/controllers/freestyle';
 
-const { inject, computed } = Ember;
-
 export default FreestyleController.extend({
-  emberFreestyle: inject.service(),
+  emberFreestyle: service(),
 
   timerTicks: 0,
 
diff --git a/ui/app/controllers/jobs.js b/ui/app/controllers/jobs.js
index 88f3d60e1..e7a69a7d8 100644
--- a/ui/app/controllers/jobs.js
+++ b/ui/app/controllers/jobs.js
@@ -1,9 +1,10 @@
-import Ember from 'ember';
-
-const { Controller, inject, observer, run } = Ember;
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
+import { observer } from '@ember/object';
+import { run } from '@ember/runloop';
 
 export default Controller.extend({
-  system: inject.service(),
+  system: service(),
 
   queryParams: {
     jobNamespace: 'namespace',
diff --git a/ui/app/controllers/jobs/index.js b/ui/app/controllers/jobs/index.js
index 079d30dc3..d0d06e9ee 100644
--- a/ui/app/controllers/jobs/index.js
+++ b/ui/app/controllers/jobs/index.js
@@ -1,18 +1,19 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import { alias, filterBy } from '@ember/object/computed';
+import Controller, { inject as controller } from '@ember/controller';
+import { computed } from '@ember/object';
 import Sortable from 'nomad-ui/mixins/sortable';
 import Searchable from 'nomad-ui/mixins/searchable';
 
-const { Controller, computed, inject } = Ember;
-
 export default Controller.extend(Sortable, Searchable, {
-  system: inject.service(),
-  jobsController: inject.controller('jobs'),
+  system: service(),
+  jobsController: controller('jobs'),
 
-  isForbidden: computed.alias('jobsController.isForbidden'),
+  isForbidden: alias('jobsController.isForbidden'),
 
-  pendingJobs: computed.filterBy('model', 'status', 'pending'),
-  runningJobs: computed.filterBy('model', 'status', 'running'),
-  deadJobs: computed.filterBy('model', 'status', 'dead'),
+  pendingJobs: filterBy('model', 'status', 'pending'),
+  runningJobs: filterBy('model', 'status', 'running'),
+  deadJobs: filterBy('model', 'status', 'dead'),
 
   queryParams: {
     currentPage: 'page',
@@ -42,9 +43,9 @@ export default Controller.extend(Sortable, Searchable, {
     }
   ),
 
-  listToSort: computed.alias('filteredJobs'),
-  listToSearch: computed.alias('listSorted'),
-  sortedJobs: computed.alias('listSearched'),
+  listToSort: alias('filteredJobs'),
+  listToSearch: alias('listSorted'),
+  sortedJobs: alias('listSearched'),
 
   isShowingDeploymentDetails: false,
 
diff --git a/ui/app/controllers/jobs/job.js b/ui/app/controllers/jobs/job.js
index fab3c3204..5b8865a11 100644
--- a/ui/app/controllers/jobs/job.js
+++ b/ui/app/controllers/jobs/job.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Controller, computed } = Ember;
+import Controller from '@ember/controller';
+import { computed } from '@ember/object';
 
 export default Controller.extend({
   breadcrumbs: computed('model.{name,id}', function() {
diff --git a/ui/app/controllers/jobs/job/definition.js b/ui/app/controllers/jobs/job/definition.js
index 95144a831..b105b72b0 100644
--- a/ui/app/controllers/jobs/job/definition.js
+++ b/ui/app/controllers/jobs/job/definition.js
@@ -1,12 +1,11 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import Controller, { inject as controller } from '@ember/controller';
 import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting';
 
-const { Controller, computed, inject } = Ember;
-
 export default Controller.extend(WithNamespaceResetting, {
-  jobController: inject.controller('jobs.job'),
+  jobController: controller('jobs.job'),
 
-  job: computed.alias('model.job'),
+  job: alias('model.job'),
 
-  breadcrumbs: computed.alias('jobController.breadcrumbs'),
+  breadcrumbs: alias('jobController.breadcrumbs'),
 });
diff --git a/ui/app/controllers/jobs/job/deployments.js b/ui/app/controllers/jobs/job/deployments.js
index a8c6b1761..0540c98b1 100644
--- a/ui/app/controllers/jobs/job/deployments.js
+++ b/ui/app/controllers/jobs/job/deployments.js
@@ -1,13 +1,12 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import Controller, { inject as controller } from '@ember/controller';
 import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting';
 
-const { Controller, computed, inject } = Ember;
-
 export default Controller.extend(WithNamespaceResetting, {
-  jobController: inject.controller('jobs.job'),
+  jobController: controller('jobs.job'),
 
-  job: computed.alias('model'),
-  deployments: computed.alias('model.deployments'),
+  job: alias('model'),
+  deployments: alias('model.deployments'),
 
-  breadcrumbs: computed.alias('jobController.breadcrumbs'),
+  breadcrumbs: alias('jobController.breadcrumbs'),
 });
diff --git a/ui/app/controllers/jobs/job/index.js b/ui/app/controllers/jobs/job/index.js
index 2738cccf1..97b97efb5 100644
--- a/ui/app/controllers/jobs/job/index.js
+++ b/ui/app/controllers/jobs/job/index.js
@@ -1,12 +1,13 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import { alias } from '@ember/object/computed';
+import Controller, { inject as controller } from '@ember/controller';
+import { computed } from '@ember/object';
 import Sortable from 'nomad-ui/mixins/sortable';
 import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting';
 
-const { Controller, computed, inject } = Ember;
-
 export default Controller.extend(Sortable, WithNamespaceResetting, {
-  system: inject.service(),
-  jobController: inject.controller('jobs.job'),
+  system: service(),
+  jobController: controller('jobs.job'),
 
   queryParams: {
     currentPage: 'page',
@@ -20,15 +21,15 @@ export default Controller.extend(Sortable, WithNamespaceResetting, {
   sortProperty: 'name',
   sortDescending: false,
 
-  breadcrumbs: computed.alias('jobController.breadcrumbs'),
-  job: computed.alias('model'),
+  breadcrumbs: alias('jobController.breadcrumbs'),
+  job: alias('model'),
 
   taskGroups: computed('model.taskGroups.[]', function() {
     return this.get('model.taskGroups') || [];
   }),
 
-  listToSort: computed.alias('taskGroups'),
-  sortedTaskGroups: computed.alias('listSorted'),
+  listToSort: alias('taskGroups'),
+  sortedTaskGroups: alias('listSorted'),
 
   sortedEvaluations: computed('model.evaluations.@each.modifyIndex', function() {
     return (this.get('model.evaluations') || []).sortBy('modifyIndex').reverse();
diff --git a/ui/app/controllers/jobs/job/loading.js b/ui/app/controllers/jobs/job/loading.js
index bb159e836..2251e2d75 100644
--- a/ui/app/controllers/jobs/job/loading.js
+++ b/ui/app/controllers/jobs/job/loading.js
@@ -1,8 +1,7 @@
-import Ember from 'ember';
-
-const { Controller, computed, inject } = Ember;
+import { alias } from '@ember/object/computed';
+import Controller, { inject as controller } from '@ember/controller';
 
 export default Controller.extend({
-  jobController: inject.controller('jobs.job'),
-  breadcrumbs: computed.alias('jobController.breadcrumbs'),
+  jobController: controller('jobs.job'),
+  breadcrumbs: alias('jobController.breadcrumbs'),
 });
diff --git a/ui/app/controllers/jobs/job/task-group.js b/ui/app/controllers/jobs/job/task-group.js
index 4fc628201..2e2ab25e7 100644
--- a/ui/app/controllers/jobs/job/task-group.js
+++ b/ui/app/controllers/jobs/job/task-group.js
@@ -1,12 +1,12 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import Controller, { inject as controller } from '@ember/controller';
+import { computed } from '@ember/object';
 import Sortable from 'nomad-ui/mixins/sortable';
 import Searchable from 'nomad-ui/mixins/searchable';
 import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting';
 
-const { Controller, computed, inject } = Ember;
-
 export default Controller.extend(Sortable, Searchable, WithNamespaceResetting, {
-  jobController: inject.controller('jobs.job'),
+  jobController: controller('jobs.job'),
 
   queryParams: {
     currentPage: 'page',
@@ -27,9 +27,9 @@ export default Controller.extend(Sortable, Searchable, WithNamespaceResetting, {
     return this.get('model.allocations') || [];
   }),
 
-  listToSort: computed.alias('allocations'),
-  listToSearch: computed.alias('listSorted'),
-  sortedAllocations: computed.alias('listSearched'),
+  listToSort: alias('allocations'),
+  listToSearch: alias('listSorted'),
+  sortedAllocations: alias('listSearched'),
 
   breadcrumbs: computed('jobController.breadcrumbs.[]', 'model.{name}', function() {
     return this.get('jobController.breadcrumbs').concat([
diff --git a/ui/app/controllers/jobs/job/versions.js b/ui/app/controllers/jobs/job/versions.js
index 3b2420213..eb669a22b 100644
--- a/ui/app/controllers/jobs/job/versions.js
+++ b/ui/app/controllers/jobs/job/versions.js
@@ -1,13 +1,12 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import Controller, { inject as controller } from '@ember/controller';
 import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting';
 
-const { Controller, computed, inject } = Ember;
-
 export default Controller.extend(WithNamespaceResetting, {
-  jobController: inject.controller('jobs.job'),
+  jobController: controller('jobs.job'),
 
-  job: computed.alias('model'),
-  versions: computed.alias('model.versions'),
+  job: alias('model'),
+  versions: alias('model.versions'),
 
-  breadcrumbs: computed.alias('jobController.breadcrumbs'),
+  breadcrumbs: alias('jobController.breadcrumbs'),
 });
diff --git a/ui/app/controllers/servers.js b/ui/app/controllers/servers.js
index a8d0e1f8a..5e6f1bea4 100644
--- a/ui/app/controllers/servers.js
+++ b/ui/app/controllers/servers.js
@@ -1,11 +1,10 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import Controller from '@ember/controller';
 import Sortable from 'nomad-ui/mixins/sortable';
 
-const { Controller, computed } = Ember;
-
 export default Controller.extend(Sortable, {
-  nodes: computed.alias('model.nodes'),
-  agents: computed.alias('model.agents'),
+  nodes: alias('model.nodes'),
+  agents: alias('model.agents'),
 
   queryParams: {
     currentPage: 'page',
@@ -21,6 +20,6 @@ export default Controller.extend(Sortable, {
 
   isForbidden: false,
 
-  listToSort: computed.alias('agents'),
-  sortedAgents: computed.alias('listSorted'),
+  listToSort: alias('agents'),
+  sortedAgents: alias('listSorted'),
 });
diff --git a/ui/app/controllers/servers/index.js b/ui/app/controllers/servers/index.js
index adf0eee4d..ee49e8f72 100644
--- a/ui/app/controllers/servers/index.js
+++ b/ui/app/controllers/servers/index.js
@@ -1,8 +1,7 @@
-import Ember from 'ember';
-
-const { Controller, computed, inject } = Ember;
+import { alias } from '@ember/object/computed';
+import Controller, { inject as controller } from '@ember/controller';
 
 export default Controller.extend({
-  serversController: inject.controller('servers'),
-  isForbidden: computed.alias('serversController.isForbidden'),
+  serversController: controller('servers'),
+  isForbidden: alias('serversController.isForbidden'),
 });
diff --git a/ui/app/controllers/servers/server.js b/ui/app/controllers/servers/server.js
index 94f5f0bdd..dd455b3ad 100644
--- a/ui/app/controllers/servers/server.js
+++ b/ui/app/controllers/servers/server.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Controller, computed } = Ember;
+import Controller from '@ember/controller';
+import { computed } from '@ember/object';
 
 export default Controller.extend({
   activeTab: 'tags',
diff --git a/ui/app/controllers/settings/tokens.js b/ui/app/controllers/settings/tokens.js
index 2aad23469..be1db757d 100644
--- a/ui/app/controllers/settings/tokens.js
+++ b/ui/app/controllers/settings/tokens.js
@@ -1,12 +1,13 @@
-import Ember from 'ember';
-
-const { Controller, inject, computed, getOwner } = Ember;
+import { inject as service } from '@ember/service';
+import { reads } from '@ember/object/computed';
+import Controller from '@ember/controller';
+import { getOwner } from '@ember/application';
 
 export default Controller.extend({
-  token: inject.service(),
-  store: inject.service(),
+  token: service(),
+  store: service(),
 
-  secret: computed.reads('token.secret'),
+  secret: reads('token.secret'),
 
   tokenIsValid: false,
   tokenIsInvalid: false,
diff --git a/ui/app/helpers/css-class.js b/ui/app/helpers/css-class.js
index a23d3b90d..d7f30127c 100644
--- a/ui/app/helpers/css-class.js
+++ b/ui/app/helpers/css-class.js
@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
 /**
  * CSS Class
@@ -12,4 +12,4 @@ export function cssClass([updateType]) {
   return updateType.replace(/\//g, '-').dasherize();
 }
 
-export default Ember.Helper.helper(cssClass);
+export default helper(cssClass);
diff --git a/ui/app/helpers/format-bytes.js b/ui/app/helpers/format-bytes.js
index dc3ab3e15..b2c69ed06 100644
--- a/ui/app/helpers/format-bytes.js
+++ b/ui/app/helpers/format-bytes.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Helper } = Ember;
+import Helper from '@ember/component/helper';
 
 const UNITS = ['Bytes', 'KiB', 'MiB'];
 
diff --git a/ui/app/helpers/format-percentage.js b/ui/app/helpers/format-percentage.js
index ff4358bc7..cfd409c13 100644
--- a/ui/app/helpers/format-percentage.js
+++ b/ui/app/helpers/format-percentage.js
@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
 /**
  * Percentage Calculator
@@ -35,4 +35,4 @@ function safeNumber(value) {
   return isNaN(value) ? 0 : +value;
 }
 
-export default Ember.Helper.helper(formatPercentage);
+export default helper(formatPercentage);
diff --git a/ui/app/helpers/is-object.js b/ui/app/helpers/is-object.js
index 0b7dae86d..97dd42e65 100644
--- a/ui/app/helpers/is-object.js
+++ b/ui/app/helpers/is-object.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Helper } = Ember;
+import Helper from '@ember/component/helper';
 
 export function isObject([value]) {
   const isObject = !Array.isArray(value) && value !== null && typeof value === 'object';
diff --git a/ui/app/helpers/lazy-click.js b/ui/app/helpers/lazy-click.js
index f9d12dcd2..de96d1c0e 100644
--- a/ui/app/helpers/lazy-click.js
+++ b/ui/app/helpers/lazy-click.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Helper, $ } = Ember;
+import Helper from '@ember/component/helper';
+import $ from 'jquery';
 
 /**
  * Lazy Click Event
diff --git a/ui/app/helpers/pluralize.js b/ui/app/helpers/pluralize.js
index 161b366a4..fcab84cbe 100644
--- a/ui/app/helpers/pluralize.js
+++ b/ui/app/helpers/pluralize.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Helper } = Ember;
+import Helper from '@ember/component/helper';
 
 export function pluralize([term, count]) {
   return count === 1 ? term : term.pluralize();
diff --git a/ui/app/helpers/x-icon.js b/ui/app/helpers/x-icon.js
index d3c670e54..f53a50543 100644
--- a/ui/app/helpers/x-icon.js
+++ b/ui/app/helpers/x-icon.js
@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 import { inlineSvg } from 'ember-inline-svg/helpers/inline-svg';
 
 // Generated at compile-time by ember-inline-svg
@@ -18,4 +18,4 @@ export function xIcon(params, options) {
   return inlineSvg(SVGs, name, { class: classes });
 }
 
-export default Ember.Helper.helper(xIcon);
+export default helper(xIcon);
diff --git a/ui/app/mixins/searchable.js b/ui/app/mixins/searchable.js
index 99a929eed..26557f75a 100644
--- a/ui/app/mixins/searchable.js
+++ b/ui/app/mixins/searchable.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Mixin, computed, get } = Ember;
+import Mixin from '@ember/object/mixin';
+import { get, computed } from '@ember/object';
 
 /**
   Searchable mixin
diff --git a/ui/app/mixins/sortable.js b/ui/app/mixins/sortable.js
index 269075cd8..e6a78aaf9 100644
--- a/ui/app/mixins/sortable.js
+++ b/ui/app/mixins/sortable.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Mixin, computed } = Ember;
+import Mixin from '@ember/object/mixin';
+import { computed } from '@ember/object';
 
 /**
   Sortable mixin
diff --git a/ui/app/mixins/window-resizable.js b/ui/app/mixins/window-resizable.js
index 3f3c5b7aa..6a7055bdf 100644
--- a/ui/app/mixins/window-resizable.js
+++ b/ui/app/mixins/window-resizable.js
@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import Mixin from '@ember/object/mixin';
+import { run } from '@ember/runloop';
+import $ from 'jquery';
 
-const { run, $ } = Ember;
-
-export default Ember.Mixin.create({
+export default Mixin.create({
   setupWindowResize: function() {
     run.scheduleOnce('afterRender', this, () => {
       this.set('_windowResizeHandler', this.get('windowResizeHandler').bind(this));
diff --git a/ui/app/mixins/with-forbidden-state.js b/ui/app/mixins/with-forbidden-state.js
index 4b1397e09..85f27676a 100644
--- a/ui/app/mixins/with-forbidden-state.js
+++ b/ui/app/mixins/with-forbidden-state.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Mixin } = Ember;
+import Mixin from '@ember/object/mixin';
 
 export default Mixin.create({
   setupController(controller) {
diff --git a/ui/app/mixins/with-model-error-handling.js b/ui/app/mixins/with-model-error-handling.js
index 585c61595..484a80148 100644
--- a/ui/app/mixins/with-model-error-handling.js
+++ b/ui/app/mixins/with-model-error-handling.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Mixin from '@ember/object/mixin';
 import notifyError from 'nomad-ui/utils/notify-error';
 
-const { Mixin } = Ember;
-
 export default Mixin.create({
   model() {
     return this._super(...arguments).catch(notifyError(this));
diff --git a/ui/app/mixins/with-namespace-resetting.js b/ui/app/mixins/with-namespace-resetting.js
index c40407568..ab57f3e3e 100644
--- a/ui/app/mixins/with-namespace-resetting.js
+++ b/ui/app/mixins/with-namespace-resetting.js
@@ -1,10 +1,10 @@
-import Ember from 'ember';
-
-const { Mixin, inject } = Ember;
+import { inject as controller } from '@ember/controller';
+import { inject as service } from '@ember/service';
+import Mixin from '@ember/object/mixin';
 
 export default Mixin.create({
-  system: inject.service(),
-  jobsController: inject.controller('jobs'),
+  system: service(),
+  jobsController: controller('jobs'),
 
   actions: {
     gotoJobs(namespace) {
diff --git a/ui/app/models/agent.js b/ui/app/models/agent.js
index aea6c7ee5..63bd7d2b0 100644
--- a/ui/app/models/agent.js
+++ b/ui/app/models/agent.js
@@ -1,11 +1,10 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import { computed } from '@ember/object';
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 
-const { computed, inject } = Ember;
-
 export default Model.extend({
-  system: inject.service(),
+  system: service(),
 
   name: attr('string'),
   address: attr('string'),
diff --git a/ui/app/models/allocation.js b/ui/app/models/allocation.js
index 6cf164a41..617c1d3f7 100644
--- a/ui/app/models/allocation.js
+++ b/ui/app/models/allocation.js
@@ -1,4 +1,7 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import { readOnly } from '@ember/object/computed';
+import { computed } from '@ember/object';
+import RSVP from 'rsvp';
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import { belongsTo } from 'ember-data/relationships';
@@ -7,8 +10,6 @@ import PromiseObject from '../utils/classes/promise-object';
 import timeout from '../utils/timeout';
 import shortUUIDProperty from '../utils/properties/short-uuid';
 
-const { computed, RSVP, inject } = Ember;
-
 const STATUS_ORDER = {
   pending: 1,
   running: 2,
@@ -18,7 +19,7 @@ const STATUS_ORDER = {
 };
 
 export default Model.extend({
-  token: inject.service(),
+  token: service(),
 
   shortId: shortUUIDProperty('id'),
   job: belongsTo('job'),
@@ -56,7 +57,7 @@ export default Model.extend({
     return taskGroups && taskGroups.findBy('name', this.get('taskGroupName'));
   }),
 
-  memoryUsed: computed.readOnly('stats.ResourceUsage.MemoryStats.RSS'),
+  memoryUsed: readOnly('stats.ResourceUsage.MemoryStats.RSS'),
   cpuUsed: computed('stats.ResourceUsage.CpuStats.TotalTicks', function() {
     return Math.floor(this.get('stats.ResourceUsage.CpuStats.TotalTicks') || 0);
   }),
diff --git a/ui/app/models/deployment.js b/ui/app/models/deployment.js
index 8f4440ba2..02dfb4c81 100644
--- a/ui/app/models/deployment.js
+++ b/ui/app/models/deployment.js
@@ -1,4 +1,5 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import { computed } from '@ember/object';
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import { belongsTo, hasMany } from 'ember-data/relationships';
@@ -6,8 +7,6 @@ import { fragmentArray } from 'ember-data-model-fragments/attributes';
 import shortUUIDProperty from '../utils/properties/short-uuid';
 import sumAggregation from '../utils/properties/sum-aggregation';
 
-const { computed } = Ember;
-
 export default Model.extend({
   shortId: shortUUIDProperty('id'),
 
@@ -35,7 +34,7 @@ export default Model.extend({
   }),
 
   // Dependent keys can only go one level past an @each so an alias is needed
-  versionSubmitTime: computed.alias('version.submitTime'),
+  versionSubmitTime: alias('version.submitTime'),
 
   placedCanaries: sumAggregation('taskGroupSummaries', 'placedCanaries'),
   desiredCanaries: sumAggregation('taskGroupSummaries', 'desiredCanaries'),
diff --git a/ui/app/models/evaluation.js b/ui/app/models/evaluation.js
index 8afdf15ae..5fcb3550a 100644
--- a/ui/app/models/evaluation.js
+++ b/ui/app/models/evaluation.js
@@ -1,12 +1,10 @@
-import Ember from 'ember';
+import { bool } from '@ember/object/computed';
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import { belongsTo } from 'ember-data/relationships';
 import { fragmentArray } from 'ember-data-model-fragments/attributes';
 import shortUUIDProperty from '../utils/properties/short-uuid';
 
-const { computed } = Ember;
-
 export default Model.extend({
   shortId: shortUUIDProperty('id'),
   priority: attr('number'),
@@ -16,7 +14,7 @@ export default Model.extend({
   statusDescription: attr('string'),
   failedTGAllocs: fragmentArray('placement-failure', { defaultValue: () => [] }),
 
-  hasPlacementFailures: computed.bool('failedTGAllocs.length'),
+  hasPlacementFailures: bool('failedTGAllocs.length'),
 
   // TEMPORARY: https://github.com/emberjs/data/issues/5209
   originalJobId: attr('string'),
diff --git a/ui/app/models/job.js b/ui/app/models/job.js
index 4f33983ac..511f89856 100644
--- a/ui/app/models/job.js
+++ b/ui/app/models/job.js
@@ -1,12 +1,11 @@
-import Ember from 'ember';
+import { collect, sum, bool, equal } from '@ember/object/computed';
+import { computed } from '@ember/object';
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import { belongsTo, hasMany } from 'ember-data/relationships';
 import { fragmentArray } from 'ember-data-model-fragments/attributes';
 import sumAggregation from '../utils/properties/sum-aggregation';
 
-const { computed } = Ember;
-
 export default Model.extend({
   region: attr('string'),
   name: attr('string'),
@@ -35,7 +34,7 @@ export default Model.extend({
   failedAllocs: sumAggregation('taskGroupSummaries', 'failedAllocs'),
   lostAllocs: sumAggregation('taskGroupSummaries', 'lostAllocs'),
 
-  allocsList: computed.collect(
+  allocsList: collect(
     'queuedAllocs',
     'startingAllocs',
     'runningAllocs',
@@ -44,7 +43,7 @@ export default Model.extend({
     'lostAllocs'
   ),
 
-  totalAllocs: computed.sum('allocsList'),
+  totalAllocs: sum('allocsList'),
 
   pendingChildren: attr('number'),
   runningChildren: attr('number'),
@@ -56,7 +55,7 @@ export default Model.extend({
   evaluations: hasMany('evaluations'),
   namespace: belongsTo('namespace'),
 
-  hasPlacementFailures: computed.bool('latestFailureEvaluation'),
+  hasPlacementFailures: bool('latestFailureEvaluation'),
 
   latestEvaluation: computed('evaluations.@each.modifyIndex', 'evaluations.isPending', function() {
     const evaluations = this.get('evaluations');
@@ -82,7 +81,7 @@ export default Model.extend({
     }
   ),
 
-  supportsDeployments: computed.equal('type', 'service'),
+  supportsDeployments: equal('type', 'service'),
 
   runningDeployment: computed('deployments.@each.status', function() {
     return this.get('deployments').findBy('status', 'running');
diff --git a/ui/app/models/namespace.js b/ui/app/models/namespace.js
index 7b05135e8..b5b5f5750 100644
--- a/ui/app/models/namespace.js
+++ b/ui/app/models/namespace.js
@@ -1,11 +1,9 @@
-import Ember from 'ember';
+import { readOnly } from '@ember/object/computed';
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 
-const { computed } = Ember;
-
 export default Model.extend({
-  name: computed.readOnly('id'),
+  name: readOnly('id'),
   hash: attr('string'),
   description: attr('string'),
 });
diff --git a/ui/app/models/node-attributes.js b/ui/app/models/node-attributes.js
index 6bfaba7ca..c893d8500 100644
--- a/ui/app/models/node-attributes.js
+++ b/ui/app/models/node-attributes.js
@@ -1,9 +1,8 @@
-import Ember from 'ember';
+import { get, computed } from '@ember/object';
 import attr from 'ember-data/attr';
 import Fragment from 'ember-data-model-fragments/fragment';
 import flat from 'npm:flat';
 
-const { computed, get } = Ember;
 const { unflatten } = flat;
 
 export default Fragment.extend({
@@ -12,10 +11,12 @@ export default Fragment.extend({
   attributesStructured: computed('attributes', function() {
     // `unflatten` doesn't sort keys before unflattening, so manual preprocessing is necessary.
     const original = this.get('attributes');
-    const attrs = Object.keys(original).sort().reduce((obj, key) => {
-      obj[key] = original[key];
-      return obj;
-    }, {});
+    const attrs = Object.keys(original)
+      .sort()
+      .reduce((obj, key) => {
+        obj[key] = original[key];
+        return obj;
+      }, {});
     return unflatten(attrs, { overwrite: true });
   }),
 
diff --git a/ui/app/models/node.js b/ui/app/models/node.js
index 6966acfb9..56e489e1d 100644
--- a/ui/app/models/node.js
+++ b/ui/app/models/node.js
@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import { hasMany } from 'ember-data/relationships';
@@ -6,8 +6,6 @@ import { fragment } from 'ember-data-model-fragments/attributes';
 import shortUUIDProperty from '../utils/properties/short-uuid';
 import ipParts from '../utils/ip-parts';
 
-const { computed } = Ember;
-
 export default Model.extend({
   // Available from list response
   name: attr('string'),
diff --git a/ui/app/models/task-event.js b/ui/app/models/task-event.js
index 1a26daadc..3d6f464f3 100644
--- a/ui/app/models/task-event.js
+++ b/ui/app/models/task-event.js
@@ -1,10 +1,9 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
 import Fragment from 'ember-data-model-fragments/fragment';
 import attr from 'ember-data/attr';
 import { fragmentOwner } from 'ember-data-model-fragments/attributes';
 import moment from 'moment';
 
-const { computed } = Ember;
 const displayProps = [
   'message',
   'validationError',
diff --git a/ui/app/models/task-group-deployment-summary.js b/ui/app/models/task-group-deployment-summary.js
index 9a6b0eab3..9d5c04035 100644
--- a/ui/app/models/task-group-deployment-summary.js
+++ b/ui/app/models/task-group-deployment-summary.js
@@ -1,10 +1,8 @@
-import Ember from 'ember';
+import { gt } from '@ember/object/computed';
 import Fragment from 'ember-data-model-fragments/fragment';
 import attr from 'ember-data/attr';
 import { fragmentOwner } from 'ember-data-model-fragments/attributes';
 
-const { computed } = Ember;
-
 export default Fragment.extend({
   deployment: fragmentOwner(),
 
@@ -12,7 +10,7 @@ export default Fragment.extend({
 
   autoRevert: attr('boolean'),
   promoted: attr('boolean'),
-  requiresPromotion: computed.gt('desiredCanaries', 0),
+  requiresPromotion: gt('desiredCanaries', 0),
 
   placedCanaries: attr('number'),
   desiredCanaries: attr('number'),
diff --git a/ui/app/models/task-group-summary.js b/ui/app/models/task-group-summary.js
index 5d937f73b..9e713b8ab 100644
--- a/ui/app/models/task-group-summary.js
+++ b/ui/app/models/task-group-summary.js
@@ -1,10 +1,8 @@
-import Ember from 'ember';
+import { collect, sum } from '@ember/object/computed';
 import Fragment from 'ember-data-model-fragments/fragment';
 import attr from 'ember-data/attr';
 import { fragmentOwner } from 'ember-data-model-fragments/attributes';
 
-const { computed } = Ember;
-
 export default Fragment.extend({
   job: fragmentOwner(),
   name: attr('string'),
@@ -16,7 +14,7 @@ export default Fragment.extend({
   failedAllocs: attr('number'),
   lostAllocs: attr('number'),
 
-  allocsList: computed.collect(
+  allocsList: collect(
     'queuedAllocs',
     'startingAllocs',
     'runningAllocs',
@@ -25,5 +23,5 @@ export default Fragment.extend({
     'lostAllocs'
   ),
 
-  totalAllocs: computed.sum('allocsList'),
+  totalAllocs: sum('allocsList'),
 });
diff --git a/ui/app/models/task-group.js b/ui/app/models/task-group.js
index b3998a4cd..e5ea67d0e 100644
--- a/ui/app/models/task-group.js
+++ b/ui/app/models/task-group.js
@@ -1,11 +1,9 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
 import Fragment from 'ember-data-model-fragments/fragment';
 import attr from 'ember-data/attr';
 import { fragmentOwner, fragmentArray } from 'ember-data-model-fragments/attributes';
 import sumAggregation from '../utils/properties/sum-aggregation';
 
-const { computed } = Ember;
-
 export default Fragment.extend({
   job: fragmentOwner(),
 
diff --git a/ui/app/models/task-state.js b/ui/app/models/task-state.js
index a5b3bff22..217e87459 100644
--- a/ui/app/models/task-state.js
+++ b/ui/app/models/task-state.js
@@ -1,10 +1,9 @@
-import Ember from 'ember';
+import { none } from '@ember/object/computed';
+import { computed } from '@ember/object';
 import Fragment from 'ember-data-model-fragments/fragment';
 import attr from 'ember-data/attr';
 import { fragment, fragmentOwner, fragmentArray } from 'ember-data-model-fragments/attributes';
 
-const { computed } = Ember;
-
 export default Fragment.extend({
   name: attr('string'),
   state: attr('string'),
@@ -12,7 +11,7 @@ export default Fragment.extend({
   finishedAt: attr('date'),
   failed: attr('boolean'),
 
-  isActive: computed.none('finishedAt'),
+  isActive: none('finishedAt'),
 
   allocation: fragmentOwner(),
   task: computed('allocation.taskGroup.tasks.[]', function() {
diff --git a/ui/app/models/token.js b/ui/app/models/token.js
index 07243dd8a..37db199ae 100644
--- a/ui/app/models/token.js
+++ b/ui/app/models/token.js
@@ -1,10 +1,8 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import { hasMany } from 'ember-data/relationships';
 
-const { computed } = Ember;
-
 export default Model.extend({
   secret: attr('string'),
   name: attr('string'),
@@ -14,5 +12,5 @@ export default Model.extend({
   policies: hasMany('policy'),
   policyNames: attr(),
 
-  accessor: computed.alias('id'),
+  accessor: alias('id'),
 });
diff --git a/ui/app/router.js b/ui/app/router.js
index bddf8813d..494a2173d 100644
--- a/ui/app/router.js
+++ b/ui/app/router.js
@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-const Router = Ember.Router.extend({
+const Router = EmberRouter.extend({
   location: config.locationType,
   rootURL: config.rootURL,
 });
diff --git a/ui/app/routes/allocations/allocation.js b/ui/app/routes/allocations/allocation.js
index 60eff663b..17aa8b10c 100644
--- a/ui/app/routes/allocations/allocation.js
+++ b/ui/app/routes/allocations/allocation.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import WithModelErrorHandling from 'nomad-ui/mixins/with-model-error-handling';
 
-const { Route } = Ember;
-
 export default Route.extend(WithModelErrorHandling);
diff --git a/ui/app/routes/allocations/allocation/task.js b/ui/app/routes/allocations/allocation/task.js
index 4a57f1ad2..dcf2bda10 100644
--- a/ui/app/routes/allocations/allocation/task.js
+++ b/ui/app/routes/allocations/allocation/task.js
@@ -1,9 +1,9 @@
-import Ember from 'ember';
-
-const { Route, inject, Error: EmberError } = Ember;
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
+import EmberError from '@ember/error';
 
 export default Route.extend({
-  store: inject.service(),
+  store: service(),
 
   model({ name }) {
     const allocation = this.modelFor('allocations.allocation');
diff --git a/ui/app/routes/allocations/allocation/task/logs.js b/ui/app/routes/allocations/allocation/task/logs.js
index 5e4767eb5..399258f21 100644
--- a/ui/app/routes/allocations/allocation/task/logs.js
+++ b/ui/app/routes/allocations/allocation/task/logs.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Route } = Ember;
+import Route from '@ember/routing/route';
 
 export default Route.extend({
   model() {
diff --git a/ui/app/routes/application.js b/ui/app/routes/application.js
index 0a2e57c39..f7437a18c 100644
--- a/ui/app/routes/application.js
+++ b/ui/app/routes/application.js
@@ -1,9 +1,8 @@
-import Ember from 'ember';
-
-const { Route, inject } = Ember;
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 
 export default Route.extend({
-  config: inject.service(),
+  config: service(),
 
   resetController(controller, isExiting) {
     if (isExiting) {
diff --git a/ui/app/routes/clients.js b/ui/app/routes/clients.js
index f2915a3a9..49559c8c9 100644
--- a/ui/app/routes/clients.js
+++ b/ui/app/routes/clients.js
@@ -1,12 +1,12 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
+import RSVP from 'rsvp';
 import WithForbiddenState from 'nomad-ui/mixins/with-forbidden-state';
 import notifyForbidden from 'nomad-ui/utils/notify-forbidden';
 
-const { Route, inject, RSVP } = Ember;
-
 export default Route.extend(WithForbiddenState, {
-  store: inject.service(),
-  system: inject.service(),
+  store: service(),
+  system: service(),
 
   beforeModel() {
     return this.get('system.leader');
diff --git a/ui/app/routes/clients/client.js b/ui/app/routes/clients/client.js
index 9571d975a..1be621e47 100644
--- a/ui/app/routes/clients/client.js
+++ b/ui/app/routes/clients/client.js
@@ -1,10 +1,9 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import notifyError from 'nomad-ui/utils/notify-error';
 
-const { Route, inject } = Ember;
-
 export default Route.extend({
-  store: inject.service(),
+  store: service(),
 
   model() {
     return this._super(...arguments).catch(notifyError(this));
diff --git a/ui/app/routes/index.js b/ui/app/routes/index.js
index f07c338c8..7de6fff38 100644
--- a/ui/app/routes/index.js
+++ b/ui/app/routes/index.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Route } = Ember;
+import Route from '@ember/routing/route';
 
 export default Route.extend({
   redirect() {
diff --git a/ui/app/routes/jobs.js b/ui/app/routes/jobs.js
index 9d51a55b6..745e326e2 100644
--- a/ui/app/routes/jobs.js
+++ b/ui/app/routes/jobs.js
@@ -1,12 +1,12 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
+import { run } from '@ember/runloop';
 import WithForbiddenState from 'nomad-ui/mixins/with-forbidden-state';
 import notifyForbidden from 'nomad-ui/utils/notify-forbidden';
 
-const { Route, inject, run } = Ember;
-
 export default Route.extend(WithForbiddenState, {
-  system: inject.service(),
-  store: inject.service(),
+  system: service(),
+  store: service(),
 
   beforeModel() {
     return this.get('system.namespaces');
diff --git a/ui/app/routes/jobs/index.js b/ui/app/routes/jobs/index.js
index 8962abd90..0a8317fea 100644
--- a/ui/app/routes/jobs/index.js
+++ b/ui/app/routes/jobs/index.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Route } = Ember;
+import Route from '@ember/routing/route';
 
 export default Route.extend({
   actions: {
diff --git a/ui/app/routes/jobs/job.js b/ui/app/routes/jobs/job.js
index fa40f07bd..558ea55e4 100644
--- a/ui/app/routes/jobs/job.js
+++ b/ui/app/routes/jobs/job.js
@@ -1,10 +1,10 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
+import RSVP from 'rsvp';
 import notifyError from 'nomad-ui/utils/notify-error';
 
-const { Route, RSVP, inject } = Ember;
-
 export default Route.extend({
-  store: inject.service(),
+  store: service(),
 
   serialize(model) {
     return { job_name: model.get('plainId') };
diff --git a/ui/app/routes/jobs/job/definition.js b/ui/app/routes/jobs/job/definition.js
index 4f24dbc60..8730f83b8 100644
--- a/ui/app/routes/jobs/job/definition.js
+++ b/ui/app/routes/jobs/job/definition.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Route } = Ember;
+import Route from '@ember/routing/route';
 
 export default Route.extend({
   model() {
diff --git a/ui/app/routes/jobs/job/deployments.js b/ui/app/routes/jobs/job/deployments.js
index a048c898a..41363eff6 100644
--- a/ui/app/routes/jobs/job/deployments.js
+++ b/ui/app/routes/jobs/job/deployments.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Route, RSVP } = Ember;
+import Route from '@ember/routing/route';
+import RSVP from 'rsvp';
 
 export default Route.extend({
   model() {
diff --git a/ui/app/routes/jobs/job/task-group.js b/ui/app/routes/jobs/job/task-group.js
index 2be6107ab..def6e57ea 100644
--- a/ui/app/routes/jobs/job/task-group.js
+++ b/ui/app/routes/jobs/job/task-group.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Route } = Ember;
+import Route from '@ember/routing/route';
 
 export default Route.extend({
   model({ name }) {
diff --git a/ui/app/routes/jobs/job/versions.js b/ui/app/routes/jobs/job/versions.js
index 637d663c3..6debc85db 100644
--- a/ui/app/routes/jobs/job/versions.js
+++ b/ui/app/routes/jobs/job/versions.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Route } = Ember;
+import Route from '@ember/routing/route';
 
 export default Route.extend({
   model() {
diff --git a/ui/app/routes/not-found.js b/ui/app/routes/not-found.js
index 1974ee9ba..a7df89c01 100644
--- a/ui/app/routes/not-found.js
+++ b/ui/app/routes/not-found.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { Route, Error: EmberError } = Ember;
+import Route from '@ember/routing/route';
+import EmberError from '@ember/error';
 
 export default Route.extend({
   model() {
diff --git a/ui/app/routes/servers.js b/ui/app/routes/servers.js
index f2915a3a9..49559c8c9 100644
--- a/ui/app/routes/servers.js
+++ b/ui/app/routes/servers.js
@@ -1,12 +1,12 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
+import RSVP from 'rsvp';
 import WithForbiddenState from 'nomad-ui/mixins/with-forbidden-state';
 import notifyForbidden from 'nomad-ui/utils/notify-forbidden';
 
-const { Route, inject, RSVP } = Ember;
-
 export default Route.extend(WithForbiddenState, {
-  store: inject.service(),
-  system: inject.service(),
+  store: service(),
+  system: service(),
 
   beforeModel() {
     return this.get('system.leader');
diff --git a/ui/app/routes/servers/server.js b/ui/app/routes/servers/server.js
index 60eff663b..17aa8b10c 100644
--- a/ui/app/routes/servers/server.js
+++ b/ui/app/routes/servers/server.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import WithModelErrorHandling from 'nomad-ui/mixins/with-model-error-handling';
 
-const { Route } = Ember;
-
 export default Route.extend(WithModelErrorHandling);
diff --git a/ui/app/serializers/allocation.js b/ui/app/serializers/allocation.js
index 33cb3ebf5..8a7a5d43b 100644
--- a/ui/app/serializers/allocation.js
+++ b/ui/app/serializers/allocation.js
@@ -1,10 +1,9 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import { get } from '@ember/object';
 import ApplicationSerializer from './application';
 
-const { get, inject } = Ember;
-
 export default ApplicationSerializer.extend({
-  system: inject.service(),
+  system: service(),
 
   attrs: {
     taskGroupName: 'TaskGroup',
diff --git a/ui/app/serializers/application.js b/ui/app/serializers/application.js
index bdec30fc1..3d63f5b63 100644
--- a/ui/app/serializers/application.js
+++ b/ui/app/serializers/application.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import { makeArray } from '@ember/array';
 import JSONSerializer from 'ember-data/serializers/json';
 
-const { makeArray } = Ember;
-
 export default JSONSerializer.extend({
   primaryKey: 'ID',
 
diff --git a/ui/app/serializers/deployment.js b/ui/app/serializers/deployment.js
index 04e5475a0..2a21f484e 100644
--- a/ui/app/serializers/deployment.js
+++ b/ui/app/serializers/deployment.js
@@ -1,8 +1,7 @@
-import Ember from 'ember';
+import { get } from '@ember/object';
+import { assign } from '@ember/polyfills';
 import ApplicationSerializer from './application';
 
-const { get, assign } = Ember;
-
 export default ApplicationSerializer.extend({
   attrs: {
     versionNumber: 'JobVersion',
diff --git a/ui/app/serializers/evaluation.js b/ui/app/serializers/evaluation.js
index 76a2b9b3c..e5faad410 100644
--- a/ui/app/serializers/evaluation.js
+++ b/ui/app/serializers/evaluation.js
@@ -1,10 +1,10 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import { get } from '@ember/object';
+import { assign } from '@ember/polyfills';
 import ApplicationSerializer from './application';
 
-const { inject, get, assign } = Ember;
-
 export default ApplicationSerializer.extend({
-  system: inject.service(),
+  system: service(),
 
   normalize(typeHash, hash) {
     hash.FailedTGAllocs = Object.keys(hash.FailedTGAllocs || {}).map(key => {
diff --git a/ui/app/serializers/job-version.js b/ui/app/serializers/job-version.js
index 490b6d740..f05809b3f 100644
--- a/ui/app/serializers/job-version.js
+++ b/ui/app/serializers/job-version.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import { assign } from '@ember/polyfills';
 import ApplicationSerializer from './application';
 
-const { assign } = Ember;
-
 export default ApplicationSerializer.extend({
   attrs: {
     number: 'Version',
diff --git a/ui/app/serializers/job.js b/ui/app/serializers/job.js
index 74eeb78b0..e09c95cd8 100644
--- a/ui/app/serializers/job.js
+++ b/ui/app/serializers/job.js
@@ -1,9 +1,8 @@
-import Ember from 'ember';
+import { get } from '@ember/object';
+import { assign } from '@ember/polyfills';
 import ApplicationSerializer from './application';
 import queryString from 'npm:query-string';
 
-const { get, assign } = Ember;
-
 export default ApplicationSerializer.extend({
   attrs: {
     parameterized: 'ParameterizedJob',
diff --git a/ui/app/serializers/node.js b/ui/app/serializers/node.js
index 376f15d12..e0ecfc9a7 100644
--- a/ui/app/serializers/node.js
+++ b/ui/app/serializers/node.js
@@ -1,10 +1,8 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
 import ApplicationSerializer from './application';
 
-const { inject } = Ember;
-
 export default ApplicationSerializer.extend({
-  config: inject.service(),
+  config: service(),
 
   attrs: {
     httpAddr: 'HTTPAddr',
diff --git a/ui/app/serializers/task-group.js b/ui/app/serializers/task-group.js
index 107ddf11e..a834250c9 100644
--- a/ui/app/serializers/task-group.js
+++ b/ui/app/serializers/task-group.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import { copy } from '@ember/object/internals';
 import ApplicationSerializer from './application';
 
-const { copy } = Ember;
-
 export default ApplicationSerializer.extend({
   normalize(typeHash, hash) {
     // Provide EphemeralDisk to each task
diff --git a/ui/app/serializers/token.js b/ui/app/serializers/token.js
index ede185aed..7ac46e611 100644
--- a/ui/app/serializers/token.js
+++ b/ui/app/serializers/token.js
@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import { copy } from '@ember/object/internals';
 import ApplicationSerializer from './application';
 
-const { copy } = Ember;
-
 export default ApplicationSerializer.extend({
   primaryKey: 'AccessorID',
 
diff --git a/ui/app/services/config.js b/ui/app/services/config.js
index 2c586d97c..80e38e1ea 100644
--- a/ui/app/services/config.js
+++ b/ui/app/services/config.js
@@ -1,14 +1,14 @@
-import Ember from 'ember';
+import { equal } from '@ember/object/computed';
+import Service from '@ember/service';
+import { get } from '@ember/object';
 import config from '../config/environment';
 
-const { Service, get, computed } = Ember;
-
 export default Service.extend({
   unknownProperty(path) {
     return get(config, path);
   },
 
-  isDev: computed.equal('environment', 'development'),
-  isProd: computed.equal('environment', 'production'),
-  isTest: computed.equal('environment', 'test'),
+  isDev: equal('environment', 'development'),
+  isProd: equal('environment', 'production'),
+  isTest: equal('environment', 'test'),
 });
diff --git a/ui/app/services/system.js b/ui/app/services/system.js
index 111e3bfc2..558b411a9 100644
--- a/ui/app/services/system.js
+++ b/ui/app/services/system.js
@@ -1,12 +1,11 @@
-import Ember from 'ember';
+import Service, { inject as service } from '@ember/service';
+import { computed } from '@ember/object';
 import PromiseObject from '../utils/classes/promise-object';
 import { namespace } from '../adapters/application';
 
-const { Service, computed, inject } = Ember;
-
 export default Service.extend({
-  token: inject.service(),
-  store: inject.service(),
+  token: service(),
+  store: service(),
 
   leader: computed(function() {
     const token = this.get('token');
diff --git a/ui/app/services/token.js b/ui/app/services/token.js
index d51d7510b..4ce27d9c3 100644
--- a/ui/app/services/token.js
+++ b/ui/app/services/token.js
@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import Service from '@ember/service';
+import { computed } from '@ember/object';
+import { assign } from '@ember/polyfills';
 import fetch from 'nomad-ui/utils/fetch';
 
-const { Service, computed, assign } = Ember;
-
 export default Service.extend({
   secret: computed({
     get() {
diff --git a/ui/app/utils/classes/abstract-logger.js b/ui/app/utils/classes/abstract-logger.js
index 37ab2578b..55eb2da1e 100644
--- a/ui/app/utils/classes/abstract-logger.js
+++ b/ui/app/utils/classes/abstract-logger.js
@@ -1,16 +1,16 @@
-import Ember from 'ember';
+import { assert } from '@ember/debug';
+import Mixin from '@ember/object/mixin';
+import { computed } from '@ember/object';
+import { assign } from '@ember/polyfills';
 import queryString from 'npm:query-string';
 
-const { Mixin, computed, assign } = Ember;
 const MAX_OUTPUT_LENGTH = 50000;
 
 export default Mixin.create({
   url: '',
   params: computed(() => ({})),
   logFetch() {
-    Ember.assert(
-      'Loggers need a logFetch method, which should have an interface like window.fetch'
-    );
+    assert('Loggers need a logFetch method, which should have an interface like window.fetch');
   },
 
   endOffset: null,
diff --git a/ui/app/utils/classes/log.js b/ui/app/utils/classes/log.js
index 219be0b4e..5e873182a 100644
--- a/ui/app/utils/classes/log.js
+++ b/ui/app/utils/classes/log.js
@@ -1,11 +1,13 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import { assert } from '@ember/debug';
+import Evented from '@ember/object/evented';
+import EmberObject, { computed } from '@ember/object';
+import { assign } from '@ember/polyfills';
 import queryString from 'npm:query-string';
 import { task } from 'ember-concurrency';
 import StreamLogger from 'nomad-ui/utils/classes/stream-logger';
 import PollLogger from 'nomad-ui/utils/classes/poll-logger';
 
-const { Object: EmberObject, Evented, computed, assign } = Ember;
-
 const MAX_OUTPUT_LENGTH = 50000;
 
 const Log = EmberObject.extend(Evented, {
@@ -14,14 +16,12 @@ const Log = EmberObject.extend(Evented, {
   url: '',
   params: computed(() => ({})),
   logFetch() {
-    Ember.assert(
-      'Log objects need a logFetch method, which should have an interface like window.fetch'
-    );
+    assert('Log objects need a logFetch method, which should have an interface like window.fetch');
   },
 
   // Read-only state
 
-  isStreaming: computed.alias('logStreamer.poll.isRunning'),
+  isStreaming: alias('logStreamer.poll.isRunning'),
   logPointer: null,
   logStreamer: null,
 
diff --git a/ui/app/utils/classes/poll-logger.js b/ui/app/utils/classes/poll-logger.js
index 5310f3e45..e6c7078a7 100644
--- a/ui/app/utils/classes/poll-logger.js
+++ b/ui/app/utils/classes/poll-logger.js
@@ -1,9 +1,7 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
 import { task, timeout } from 'ember-concurrency';
 import AbstractLogger from './abstract-logger';
 
-const { Object: EmberObject } = Ember;
-
 export default EmberObject.extend(AbstractLogger, {
   interval: 1000,
 
diff --git a/ui/app/utils/classes/promise-object.js b/ui/app/utils/classes/promise-object.js
index 8732062b3..fd762b728 100644
--- a/ui/app/utils/classes/promise-object.js
+++ b/ui/app/utils/classes/promise-object.js
@@ -1,5 +1,4 @@
-import Ember from 'ember';
-
-const { ObjectProxy, PromiseProxyMixin } = Ember;
+import ObjectProxy from '@ember/object/proxy';
+import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 
 export default ObjectProxy.extend(PromiseProxyMixin);
diff --git a/ui/app/utils/classes/stream-logger.js b/ui/app/utils/classes/stream-logger.js
index f19f0c668..ee1018734 100644
--- a/ui/app/utils/classes/stream-logger.js
+++ b/ui/app/utils/classes/stream-logger.js
@@ -1,10 +1,8 @@
-import Ember from 'ember';
+import EmberObject, { computed } from '@ember/object';
 import { task } from 'ember-concurrency';
 import TextDecoder from 'nomad-ui/utils/classes/text-decoder';
 import AbstractLogger from './abstract-logger';
 
-const { Object: EmberObject, computed } = Ember;
-
 export default EmberObject.extend(AbstractLogger, {
   reader: null,
 
diff --git a/ui/app/utils/properties/short-uuid.js b/ui/app/utils/properties/short-uuid.js
index 67ac94ea6..0a7af211c 100644
--- a/ui/app/utils/properties/short-uuid.js
+++ b/ui/app/utils/properties/short-uuid.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { computed } = Ember;
+import { computed } from '@ember/object';
 
 // An Ember.Computed property for taking the first segment
 // of a uuid.
diff --git a/ui/app/utils/properties/style-string.js b/ui/app/utils/properties/style-string.js
index 0f91706f8..e6119aced 100644
--- a/ui/app/utils/properties/style-string.js
+++ b/ui/app/utils/properties/style-string.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { computed } = Ember;
+import { computed } from '@ember/object';
 
 // An Ember.Computed property for transforming an object into an
 // html compatible style attribute
diff --git a/ui/app/utils/properties/sum-aggregation.js b/ui/app/utils/properties/sum-aggregation.js
index e6561ced3..41a486a0e 100644
--- a/ui/app/utils/properties/sum-aggregation.js
+++ b/ui/app/utils/properties/sum-aggregation.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { computed } = Ember;
+import { computed } from '@ember/object';
 
 // An Ember.Computed property for summating all properties from a
 // set of objects.
@@ -9,6 +7,8 @@ const { computed } = Ember;
 //     sum: sumAggregationProperty('list', 'foo') // 4
 export default function sumAggregationProperty(listKey, propKey) {
   return computed(`${listKey}.@each.${propKey}`, function() {
-    return this.get(listKey).mapBy(propKey).reduce((sum, count) => sum + count, 0);
+    return this.get(listKey)
+      .mapBy(propKey)
+      .reduce((sum, count) => sum + count, 0);
   });
 }
diff --git a/ui/app/utils/timeout.js b/ui/app/utils/timeout.js
index f9db48850..5cff0fa99 100644
--- a/ui/app/utils/timeout.js
+++ b/ui/app/utils/timeout.js
@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { RSVP } = Ember;
+import RSVP from 'rsvp';
 
 // An always failing promise used to race against other promises
 export default function timeout(duration) {
diff --git a/ui/tests/acceptance/allocation-detail-test.js b/ui/tests/acceptance/allocation-detail-test.js
index cd31e6c00..f8a7eff95 100644
--- a/ui/tests/acceptance/allocation-detail-test.js
+++ b/ui/tests/acceptance/allocation-detail-test.js
@@ -1,11 +1,9 @@
-import Ember from 'ember';
+import $ from 'jquery';
 import { click, findAll, currentURL, find, visit } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 import moment from 'moment';
 
-const { $ } = Ember;
-
 let job;
 let node;
 let allocation;
diff --git a/ui/tests/acceptance/client-detail-test.js b/ui/tests/acceptance/client-detail-test.js
index 6cc1743ea..19da35151 100644
--- a/ui/tests/acceptance/client-detail-test.js
+++ b/ui/tests/acceptance/client-detail-test.js
@@ -1,12 +1,10 @@
-import Ember from 'ember';
+import $ from 'jquery';
 import { click, find, findAll, currentURL, visit } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 import { formatBytes } from 'nomad-ui/helpers/format-bytes';
 import moment from 'moment';
 
-const { $ } = Ember;
-
 let node;
 
 moduleForAcceptance('Acceptance | client detail', {
diff --git a/ui/tests/acceptance/job-deployments-test.js b/ui/tests/acceptance/job-deployments-test.js
index f69bebea0..45a6ae426 100644
--- a/ui/tests/acceptance/job-deployments-test.js
+++ b/ui/tests/acceptance/job-deployments-test.js
@@ -1,10 +1,10 @@
+import { get } from '@ember/object';
+import $ from 'jquery';
 import { click, findAll, find, visit } from 'ember-native-dom-helpers';
-import Ember from 'ember';
 import { test } from 'qunit';
 import moment from 'moment';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 
-const { get, $ } = Ember;
 const sum = (list, key) => list.reduce((sum, item) => sum + get(item, key), 0);
 
 let job;
diff --git a/ui/tests/acceptance/job-detail-test.js b/ui/tests/acceptance/job-detail-test.js
index cf3b1bcc5..efe84c465 100644
--- a/ui/tests/acceptance/job-detail-test.js
+++ b/ui/tests/acceptance/job-detail-test.js
@@ -1,10 +1,10 @@
+import { get } from '@ember/object';
+import $ from 'jquery';
 import { click, findAll, currentURL, find, visit } from 'ember-native-dom-helpers';
-import Ember from 'ember';
 import moment from 'moment';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 
-const { get, $ } = Ember;
 const sum = (list, key) => list.reduce((sum, item) => sum + get(item, key), 0);
 
 let job;
diff --git a/ui/tests/acceptance/job-versions-test.js b/ui/tests/acceptance/job-versions-test.js
index 9c63240a4..4d8b161ce 100644
--- a/ui/tests/acceptance/job-versions-test.js
+++ b/ui/tests/acceptance/job-versions-test.js
@@ -1,11 +1,9 @@
-import Ember from 'ember';
+import $ from 'jquery';
 import { findAll, visit } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 import moment from 'moment';
 
-const { $ } = Ember;
-
 let job;
 let versions;
 
diff --git a/ui/tests/acceptance/jobs-list-test.js b/ui/tests/acceptance/jobs-list-test.js
index c1cbaadbe..4de2869ea 100644
--- a/ui/tests/acceptance/jobs-list-test.js
+++ b/ui/tests/acceptance/jobs-list-test.js
@@ -1,10 +1,8 @@
-import Ember from 'ember';
+import $ from 'jquery';
 import { click, find, findAll, currentURL, visit, fillIn } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 
-const { $ } = Ember;
-
 moduleForAcceptance('Acceptance | jobs list', {
   beforeEach() {
     // Required for placing allocations (a result of creating jobs)
diff --git a/ui/tests/acceptance/nodes-list-test.js b/ui/tests/acceptance/nodes-list-test.js
index c78d83b4b..cc0ab00bc 100644
--- a/ui/tests/acceptance/nodes-list-test.js
+++ b/ui/tests/acceptance/nodes-list-test.js
@@ -1,12 +1,10 @@
-import Ember from 'ember';
+import $ from 'jquery';
 import { click, find, findAll, currentURL, visit } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 import { findLeader } from '../../mirage/config';
 import ipParts from 'nomad-ui/utils/ip-parts';
 
-const { $ } = Ember;
-
 function minimumSetup() {
   server.createList('node', 1);
   server.createList('agent', 1);
diff --git a/ui/tests/acceptance/server-detail-test.js b/ui/tests/acceptance/server-detail-test.js
index 94bd414b6..07c14324c 100644
--- a/ui/tests/acceptance/server-detail-test.js
+++ b/ui/tests/acceptance/server-detail-test.js
@@ -1,10 +1,8 @@
-import Ember from 'ember';
+import $ from 'jquery';
 import { find, findAll, currentURL, visit } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 
-const { $ } = Ember;
-
 let agent;
 
 moduleForAcceptance('Acceptance | server detail', {
diff --git a/ui/tests/acceptance/task-detail-test.js b/ui/tests/acceptance/task-detail-test.js
index 2c90da4d7..76beef6c8 100644
--- a/ui/tests/acceptance/task-detail-test.js
+++ b/ui/tests/acceptance/task-detail-test.js
@@ -1,12 +1,10 @@
-import Ember from 'ember';
+import $ from 'jquery';
 import { click, findAll, currentURL, find, visit } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 import moment from 'moment';
 import ipParts from 'nomad-ui/utils/ip-parts';
 
-const { $ } = Ember;
-
 let allocation;
 let task;
 
diff --git a/ui/tests/acceptance/task-group-detail-test.js b/ui/tests/acceptance/task-group-detail-test.js
index e729e1300..75404ae1e 100644
--- a/ui/tests/acceptance/task-group-detail-test.js
+++ b/ui/tests/acceptance/task-group-detail-test.js
@@ -1,12 +1,10 @@
-import Ember from 'ember';
+import $ from 'jquery';
 import { click, find, findAll, fillIn, currentURL, visit } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 import { formatBytes } from 'nomad-ui/helpers/format-bytes';
 import moment from 'moment';
 
-const { $ } = Ember;
-
 let job;
 let taskGroup;
 let tasks;
diff --git a/ui/tests/acceptance/task-logs-test.js b/ui/tests/acceptance/task-logs-test.js
index 77614c1e6..9d75fa391 100644
--- a/ui/tests/acceptance/task-logs-test.js
+++ b/ui/tests/acceptance/task-logs-test.js
@@ -1,10 +1,8 @@
-import Ember from 'ember';
+import { run } from '@ember/runloop';
 import { find } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 
-const { run } = Ember;
-
 let allocation;
 let task;
 
diff --git a/ui/tests/acceptance/token-test.js b/ui/tests/acceptance/token-test.js
index 2e62bd9e1..028f0d708 100644
--- a/ui/tests/acceptance/token-test.js
+++ b/ui/tests/acceptance/token-test.js
@@ -1,10 +1,8 @@
+import $ from 'jquery';
 import { find, findAll, fillIn, click, visit } from 'ember-native-dom-helpers';
-import Ember from 'ember';
 import { test, skip } from 'ember-qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 
-const { $ } = Ember;
-
 let job;
 let node;
 let managementToken;
diff --git a/ui/tests/helpers/destroy-app.js b/ui/tests/helpers/destroy-app.js
index 1807e213c..28dec908e 100644
--- a/ui/tests/helpers/destroy-app.js
+++ b/ui/tests/helpers/destroy-app.js
@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import { run } from '@ember/runloop';
 
 export default function destroyApp(application) {
-  Ember.run(application, 'destroy');
+  run(application, 'destroy');
   if (window.server) {
     window.server.shutdown();
   }
diff --git a/ui/tests/helpers/module-for-acceptance.js b/ui/tests/helpers/module-for-acceptance.js
index e37a54003..44fe4e0e2 100644
--- a/ui/tests/helpers/module-for-acceptance.js
+++ b/ui/tests/helpers/module-for-acceptance.js
@@ -1,10 +1,8 @@
+import { Promise } from 'rsvp';
 import { module } from 'qunit';
-import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
-const { RSVP: { Promise } } = Ember;
-
 export default function(name, options = {}) {
   module(name, {
     beforeEach() {
diff --git a/ui/tests/helpers/module-for-serializer.js b/ui/tests/helpers/module-for-serializer.js
index e2a1fec8a..d5cd2fc8b 100644
--- a/ui/tests/helpers/module-for-serializer.js
+++ b/ui/tests/helpers/module-for-serializer.js
@@ -1,9 +1,7 @@
-import Ember from 'ember';
+import { getOwner } from '@ember/application';
 import { moduleForModel } from 'ember-qunit';
 import { initialize as fragmentSerializerInitializer } from 'nomad-ui/initializers/fragment-serializer';
 
-const { getOwner } = Ember;
-
 export default function(modelName, description, options = { needs: [] }) {
   // moduleForModel correctly wires up #Serializer.store,
   // but module does not.
diff --git a/ui/tests/helpers/start-app.js b/ui/tests/helpers/start-app.js
index 56b8b8e02..2ff98a176 100644
--- a/ui/tests/helpers/start-app.js
+++ b/ui/tests/helpers/start-app.js
@@ -1,4 +1,5 @@
-import Ember from 'ember';
+import { run } from '@ember/runloop';
+import { merge } from '@ember/polyfills';
 import Application from '../../app';
 import config from '../../config/environment';
 import registerPowerSelectHelpers from '../../tests/helpers/ember-power-select';
@@ -6,10 +7,10 @@ import registerPowerSelectHelpers from '../../tests/helpers/ember-power-select';
 registerPowerSelectHelpers();
 
 export default function startApp(attrs) {
-  let attributes = Ember.merge({}, config.APP);
-  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+  let attributes = merge({}, config.APP);
+  attributes = merge(attributes, attrs); // use defaults, but you can override;
 
-  return Ember.run(() => {
+  return run(() => {
     let application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
diff --git a/ui/tests/integration/task-log-test.js b/ui/tests/integration/task-log-test.js
index 2d58d6fe4..7c1999d2c 100644
--- a/ui/tests/integration/task-log-test.js
+++ b/ui/tests/integration/task-log-test.js
@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { run } from '@ember/runloop';
 import { test, moduleForComponent } from 'ember-qunit';
 import wait from 'ember-test-helpers/wait';
 import { find, click } from 'ember-native-dom-helpers';
@@ -6,8 +6,6 @@ import hbs from 'htmlbars-inline-precompile';
 import Pretender from 'pretender';
 import { logEncode } from '../../mirage/data/logs';
 
-const { run } = Ember;
-
 const HOST = '1.1.1.1:1111';
 const commonProps = {
   interval: 50,
diff --git a/ui/tests/unit/mixins/searchable-test.js b/ui/tests/unit/mixins/searchable-test.js
index dbe9d56a6..4478913a2 100644
--- a/ui/tests/unit/mixins/searchable-test.js
+++ b/ui/tests/unit/mixins/searchable-test.js
@@ -1,15 +1,15 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import { getOwner } from '@ember/application';
+import EmberObject, { computed } from '@ember/object';
 import { moduleFor, test } from 'ember-qunit';
 import Searchable from 'nomad-ui/mixins/searchable';
 
-const { getOwner, computed } = Ember;
-
 moduleFor('mixin:searchable', 'Unit | Mixin | Searchable', {
   subject() {
-    const SearchableObject = Ember.Object.extend(Searchable, {
+    const SearchableObject = EmberObject.extend(Searchable, {
       source: null,
       searchProps: computed(() => ['id', 'name']),
-      listToSearch: computed.alias('source'),
+      listToSearch: alias('source'),
     });
 
     this.register('test-container:searchable-object', SearchableObject);
diff --git a/ui/tests/unit/models/task-group-test.js b/ui/tests/unit/models/task-group-test.js
index b5262e4fa..7f7014bcd 100644
--- a/ui/tests/unit/models/task-group-test.js
+++ b/ui/tests/unit/models/task-group-test.js
@@ -1,7 +1,6 @@
-import Ember from 'ember';
+import { get } from '@ember/object';
 import { moduleForModel, test } from 'ember-qunit';
 
-const { get } = Ember;
 const sum = (list, key) => list.reduce((sum, item) => sum + get(item, key), 0);
 
 moduleForModel('task-group', 'Unit | Model | task-group', {
diff --git a/ui/tests/unit/utils/log-test.js b/ui/tests/unit/utils/log-test.js
index e4842301a..94faed822 100644
--- a/ui/tests/unit/utils/log-test.js
+++ b/ui/tests/unit/utils/log-test.js
@@ -1,11 +1,11 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import RSVP from 'rsvp';
+import { run } from '@ember/runloop';
 import sinon from 'sinon';
 import wait from 'ember-test-helpers/wait';
 import { module, test } from 'ember-qunit';
 import _Log from 'nomad-ui/utils/classes/log';
 
-const { Object: EmberObject, RSVP, run } = Ember;
-
 let startSpy, stopSpy, initSpy, fetchSpy;
 
 const MockStreamer = EmberObject.extend({

From 54e083538efd2931136a28a627f7e197b70eab1a Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Fri, 15 Dec 2017 13:59:52 -0800
Subject: [PATCH 15/48] Remove the MODEL_FACTORY_INJECTIONS cruft

---
 ui/app/app.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ui/app/app.js b/ui/app/app.js
index c5fb686f8..7d6bae3ce 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -1,13 +1,10 @@
 import Application from '@ember/application';
-import Ember from 'ember';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 let App;
 
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
 App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,

From c65fff82caaefb76f0a0241949aca56296afd8ec Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 19 Dec 2017 14:00:45 -0800
Subject: [PATCH 16/48] Shuffle around styles to better organize around net new
 code and bulma overrides

---
 ui/app/styles/components.scss                 |  1 +
 .../{core => components}/page-layout.scss     |  5 ---
 ui/app/styles/core.scss                       | 45 ++-----------------
 ui/app/styles/core/variables.scss             | 35 +++++++++++++++
 ui/app/styles/{core => utils}/bumper.scss     |  0
 ui/app/styles/utils/reset.scss                |  6 +++
 6 files changed, 46 insertions(+), 46 deletions(-)
 rename ui/app/styles/{core => components}/page-layout.scss (92%)
 create mode 100644 ui/app/styles/core/variables.scss
 rename ui/app/styles/{core => utils}/bumper.scss (100%)
 create mode 100644 ui/app/styles/utils/reset.scss

diff --git a/ui/app/styles/components.scss b/ui/app/styles/components.scss
index cb2162c2f..f3e2a30cd 100644
--- a/ui/app/styles/components.scss
+++ b/ui/app/styles/components.scss
@@ -12,6 +12,7 @@
 @import "./components/loading-spinner";
 @import "./components/metrics";
 @import "./components/node-status-light";
+@import "./components/page-layout";
 @import "./components/simple-list";
 @import "./components/status-text";
 @import "./components/timeline";
diff --git a/ui/app/styles/core/page-layout.scss b/ui/app/styles/components/page-layout.scss
similarity index 92%
rename from ui/app/styles/core/page-layout.scss
rename to ui/app/styles/components/page-layout.scss
index 26c8de78e..d463be113 100644
--- a/ui/app/styles/core/page-layout.scss
+++ b/ui/app/styles/components/page-layout.scss
@@ -1,8 +1,3 @@
-html, body, body > .ember-view {
-  height: 100%;
-  width: 100%;
-}
-
 .page-layout {
   height: 100%;
   display: flex;
diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss
index 3021d6be0..78e76677c 100644
--- a/ui/app/styles/core.scss
+++ b/ui/app/styles/core.scss
@@ -1,47 +1,14 @@
 // Utils
+@import "./utils/reset.scss";
 @import "./utils/z-indices";
+@import "./utils/product-colors";
+@import "./utils/bumper";
 
 // Start with Bulma variables as a foundation
 @import "bulma/sass/utilities/initial-variables";
 
 // Override variables where appropriate
-@import "./utils/product-colors";
-
-$orange: #fa8e23;
-$green: #2eb039;
-$blue: $vagrant-blue;
-$purple: $terraform-purple;
-$red: #c84034;
-$grey-blue: #bbc4d1;
-
-$primary: $nomad-green;
-$warning: $orange;
-$warning-invert: $white;
-$danger: $red;
-$dark: #234;
-
-$radius: 2px;
-
-$body-size: 14px;
-$title-size: 1.75rem;
-$size-5: 1.15rem;
-$size-4: 1.3rem;
-$size-7: 0.85rem;
-
-$title-weight: $weight-semibold;
-
-$family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-  Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-
-$text: $black;
-
-$header-height: 112px;
-$gutter-width: 250px;
-
-$icon-dimensions: 1.25rem;
-$icon-dimensions-small: 1rem;
-$icon-dimensions-medium: 1.5rem;
-$icon-dimensions-large: 2.5rem;
+@import "./core/variables.scss";
 
 // Bring in the rest of Bulma
 @import "bulma/bulma";
@@ -64,7 +31,3 @@ $icon-dimensions-large: 2.5rem;
 @import "./core/tag";
 @import "./core/title";
 @import "./core/typography";
-
-// Add unique core extensions
-@import "./core/page-layout";
-@import "./core/bumper";
diff --git a/ui/app/styles/core/variables.scss b/ui/app/styles/core/variables.scss
new file mode 100644
index 000000000..6e957033e
--- /dev/null
+++ b/ui/app/styles/core/variables.scss
@@ -0,0 +1,35 @@
+$orange: #fa8e23;
+$green: #2eb039;
+$blue: $vagrant-blue;
+$purple: $terraform-purple;
+$red: #c84034;
+$grey-blue: #bbc4d1;
+
+$primary: $nomad-green;
+$warning: $orange;
+$warning-invert: $white;
+$danger: $red;
+$dark: #234;
+
+$radius: 2px;
+
+$body-size: 14px;
+$title-size: 1.75rem;
+$size-5: 1.15rem;
+$size-4: 1.3rem;
+$size-7: 0.85rem;
+
+$title-weight: $weight-semibold;
+
+$family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
+  Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+
+$text: $black;
+
+$header-height: 112px;
+$gutter-width: 250px;
+
+$icon-dimensions: 1.25rem;
+$icon-dimensions-small: 1rem;
+$icon-dimensions-medium: 1.5rem;
+$icon-dimensions-large: 2.5rem;
diff --git a/ui/app/styles/core/bumper.scss b/ui/app/styles/utils/bumper.scss
similarity index 100%
rename from ui/app/styles/core/bumper.scss
rename to ui/app/styles/utils/bumper.scss
diff --git a/ui/app/styles/utils/reset.scss b/ui/app/styles/utils/reset.scss
new file mode 100644
index 000000000..42d609252
--- /dev/null
+++ b/ui/app/styles/utils/reset.scss
@@ -0,0 +1,6 @@
+html,
+body,
+body > .ember-view {
+  height: 100%;
+  width: 100%;
+}

From 72d5359de44a542c462eb99352e6981f4e7705e2 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 19 Dec 2017 15:41:35 -0800
Subject: [PATCH 17/48] Upgrade Bulma to 5.0

---
 ui/package.json | 2 +-
 ui/yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index f8162239a..0d1b0c549 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "bulma": "0.4.2",
+    "bulma": "0.5.0",
     "core-js": "^2.4.1",
     "d3-selection": "^1.1.0",
     "d3-transition": "^1.1.0",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 37cf1a911..d0bb75a12 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -1710,9 +1710,9 @@ builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
 
-bulma@0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.4.2.tgz#3be8c832cf6658bfc421ecb41f6dc5a8a0c7c0e5"
+bulma@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.5.0.tgz#09a7932c1c15aa7ef92840f7a50b1bfebbfd5461"
 
 bytes@1:
   version "1.0.0"

From 2c7cb11a7268bc7de99c9fdfc3de4f6b21a5e464 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 19 Dec 2017 15:44:47 -0800
Subject: [PATCH 18/48] Default to 100% wide tables

Bulma 0.5.0 makes tables auto by default and adds the
full-width modifier.
---
 ui/app/styles/core/table.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/app/styles/core/table.scss b/ui/app/styles/core/table.scss
index 171379635..e1c14d6ee 100644
--- a/ui/app/styles/core/table.scss
+++ b/ui/app/styles/core/table.scss
@@ -3,6 +3,7 @@
   border-radius: $radius;
   border: 1px solid $grey-blue;
   border-collapse: separate;
+  width: 100%;
 
   &.is-fixed {
     table-layout: fixed;

From d458ae7e4e8a6c0f4b5634d4ae2bb9c25b02e893 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 19 Dec 2017 15:45:38 -0800
Subject: [PATCH 19/48] Update variable names

---
 ui/app/styles/core/message.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/styles/core/message.scss b/ui/app/styles/core/message.scss
index b5e71e6b7..dba6ffa4b 100644
--- a/ui/app/styles/core/message.scss
+++ b/ui/app/styles/core/message.scss
@@ -1,8 +1,8 @@
 .message {
-  background: $body-background;
+  background: $body-background-color;
 
   .message-header {
-    background: $body-background;
+    background: $body-background-color;
     color: $text;
     font-size: $size-5;
     font-weight: $weight-semibold;

From dbdbde4f9aadd2f820170fc3f75fea18bdfa2937 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 19 Dec 2017 17:25:35 -0800
Subject: [PATCH 20/48] Replace custom breadcrumbs CSS with new Bulma provided
 CSS

---
 ui/app/styles/components.scss                 |  1 -
 ui/app/styles/components/breadcrumbs.scss     | 26 -------------------
 ui/app/styles/core.scss                       |  1 +
 ui/app/styles/core/breadcrumb.scss            | 15 +++++++++++
 ui/app/styles/core/variables.scss             |  5 ++++
 .../allocations/allocation/index.hbs          |  8 +++---
 .../allocations/allocation/task/index.hbs     | 18 ++++++++-----
 .../allocations/allocation/task/logs.hbs      | 18 ++++++++-----
 ui/app/templates/clients/client.hbs           |  6 +++--
 ui/app/templates/clients/index.hbs            |  4 ++-
 ui/app/templates/clients/loading.hbs          |  4 ++-
 ui/app/templates/components/global-header.hbs | 14 +++++-----
 ui/app/templates/jobs/index.hbs               |  4 ++-
 ui/app/templates/jobs/job/definition.hbs      |  6 +++--
 ui/app/templates/jobs/job/deployments.hbs     |  6 +++--
 ui/app/templates/jobs/job/index.hbs           |  6 +++--
 ui/app/templates/jobs/job/loading.hbs         |  6 +++--
 ui/app/templates/jobs/job/task-group.hbs      | 19 +++++++-------
 ui/app/templates/jobs/job/versions.hbs        |  6 +++--
 ui/app/templates/jobs/loading.hbs             |  4 ++-
 ui/app/templates/servers.hbs                  |  4 ++-
 ui/tests/acceptance/client-detail-test.js     | 10 ++++---
 ui/tests/acceptance/job-detail-test.js        |  6 ++---
 ui/tests/acceptance/task-detail-test.js       | 10 +++----
 ui/tests/acceptance/task-group-detail-test.js | 14 ++++++----
 25 files changed, 127 insertions(+), 94 deletions(-)
 delete mode 100644 ui/app/styles/components/breadcrumbs.scss
 create mode 100644 ui/app/styles/core/breadcrumb.scss

diff --git a/ui/app/styles/components.scss b/ui/app/styles/components.scss
index f3e2a30cd..afd92f4e0 100644
--- a/ui/app/styles/components.scss
+++ b/ui/app/styles/components.scss
@@ -1,6 +1,5 @@
 @import "./components/badge";
 @import "./components/boxed-section";
-@import "./components/breadcrumbs";
 @import "./components/cli-window";
 @import "./components/ember-power-select";
 @import "./components/empty-message";
diff --git a/ui/app/styles/components/breadcrumbs.scss b/ui/app/styles/components/breadcrumbs.scss
deleted file mode 100644
index c3ec634a6..000000000
--- a/ui/app/styles/components/breadcrumbs.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.breadcrumbs {
-  .breadcrumb {
-    color: $white;
-    opacity: 0.7;
-    text-decoration: none;
-
-    + .breadcrumb {
-      margin-left: 15px;
-      &::before {
-        content: "/";
-        color: $primary;
-        position: relative;
-        left: -7px;
-      }
-    }
-
-    &:last-child {
-      opacity: 1;
-    }
-  }
-
-  a.breadcrumb:hover {
-    color: $primary-invert;
-    opacity: 1;
-  }
-}
diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss
index 78e76677c..e7c657bac 100644
--- a/ui/app/styles/core.scss
+++ b/ui/app/styles/core.scss
@@ -15,6 +15,7 @@
 
 // Override Bulma details where appropriate
 @import "./core/buttons";
+@import "./core/breadcrumb";
 @import "./core/columns";
 @import "./core/forms";
 @import "./core/icon";
diff --git a/ui/app/styles/core/breadcrumb.scss b/ui/app/styles/core/breadcrumb.scss
new file mode 100644
index 000000000..182decee3
--- /dev/null
+++ b/ui/app/styles/core/breadcrumb.scss
@@ -0,0 +1,15 @@
+.breadcrumb {
+  a {
+    text-decoration: none;
+    opacity: 0.7;
+
+    &:hover {
+      text-decoration: none;
+      opacity: 1;
+    }
+  }
+
+  li.is-active a {
+    opacity: 1;
+  }
+}
diff --git a/ui/app/styles/core/variables.scss b/ui/app/styles/core/variables.scss
index 6e957033e..b81a50b4e 100644
--- a/ui/app/styles/core/variables.scss
+++ b/ui/app/styles/core/variables.scss
@@ -33,3 +33,8 @@ $icon-dimensions: 1.25rem;
 $icon-dimensions-small: 1rem;
 $icon-dimensions-medium: 1.5rem;
 $icon-dimensions-large: 2.5rem;
+
+$breadcrumb-item-color: $white;
+$breadcrumb-item-hover-color: $white;
+$breadcrumb-item-active-color: $white;
+$breadcrumb-item-separator-color: $primary;
diff --git a/ui/app/templates/allocations/allocation/index.hbs b/ui/app/templates/allocations/allocation/index.hbs
index 96cb194b5..8c12406d4 100644
--- a/ui/app/templates/allocations/allocation/index.hbs
+++ b/ui/app/templates/allocations/allocation/index.hbs
@@ -1,8 +1,8 @@
 {{#global-header class="page-header"}}
-  <span class="breadcrumb">Allocations</span>
-  {{#link-to "allocations.allocation" model class="breadcrumb"}}
-    {{model.shortId}}
-  {{/link-to}}
+  <li><a href="#">Allocations</a></li>
+  <li class="is-active">
+    {{#link-to "allocations.allocation" model}}{{model.shortId}}{{/link-to}}
+  </li>
 {{/global-header}}
 {{#gutter-menu class="page-body"}}
   <section class="section">
diff --git a/ui/app/templates/allocations/allocation/task/index.hbs b/ui/app/templates/allocations/allocation/task/index.hbs
index 20dcf01ac..f7d646a54 100644
--- a/ui/app/templates/allocations/allocation/task/index.hbs
+++ b/ui/app/templates/allocations/allocation/task/index.hbs
@@ -1,11 +1,15 @@
 {{#global-header class="page-header"}}
-  <span class="breadcrumb">Allocations</span>
-  {{#link-to "allocations.allocation" model.allocation class="breadcrumb"}}
-    {{model.allocation.shortId}}
-  {{/link-to}}
-  {{#link-to "allocations.allocation.task" model.allocation model class="breadcrumb"}}
-    {{model.name}}
-  {{/link-to}}
+  <li><a href="#">Allocations</a></li>
+  <li>
+    {{#link-to "allocations.allocation" model.allocation}}
+      {{model.allocation.shortId}}
+    {{/link-to}}
+  </li>
+  <li class="is-active">
+    {{#link-to "allocations.allocation.task" model.allocation model}}
+      {{model.name}}
+    {{/link-to}}
+  </li>
 {{/global-header}}
 {{#gutter-menu class="page-body"}}
   {{partial "allocations/allocation/task/subnav"}}
diff --git a/ui/app/templates/allocations/allocation/task/logs.hbs b/ui/app/templates/allocations/allocation/task/logs.hbs
index 887d2a7d1..5628e69fc 100644
--- a/ui/app/templates/allocations/allocation/task/logs.hbs
+++ b/ui/app/templates/allocations/allocation/task/logs.hbs
@@ -1,11 +1,15 @@
 {{#global-header class="page-header"}}
-  <span class="breadcrumb">Allocations</span>
-  {{#link-to "allocations.allocation" model.allocation class="breadcrumb"}}
-    {{model.allocation.shortId}}
-  {{/link-to}}
-  {{#link-to "allocations.allocation.task" model.allocation model class="breadcrumb"}}
-    {{model.name}}
-  {{/link-to}}
+  <li><a href="#">Allocations</a></li>
+  <li>
+    {{#link-to "allocations.allocation" model.allocation}}
+      {{model.allocation.shortId}}
+    {{/link-to}}
+  </li>
+  <li class="is-active">
+    {{#link-to "allocations.allocation.task" model.allocation model}}
+      {{model.name}}
+    {{/link-to}}
+  </li>
 {{/global-header}}
 {{#gutter-menu class="page-body"}}
   {{partial "allocations/allocation/task/subnav"}}
diff --git a/ui/app/templates/clients/client.hbs b/ui/app/templates/clients/client.hbs
index a4f10bd3a..228f30100 100644
--- a/ui/app/templates/clients/client.hbs
+++ b/ui/app/templates/clients/client.hbs
@@ -1,6 +1,8 @@
 {{#global-header class="page-header"}}
-  {{#link-to "clients" class="breadcrumb"}}Clients{{/link-to}}
-  <span class="breadcrumb">{{model.shortId}}</span>
+  <li>{{#link-to "clients.index"}}Clients{{/link-to}}</li>
+  <li class="is-active">
+    {{#link-to "clients.client" model.id}}{{model.shortId}}{{/link-to}}
+  </li>
 {{/global-header}}
 {{#gutter-menu class="page-body"}}
   <section class="section">
diff --git a/ui/app/templates/clients/index.hbs b/ui/app/templates/clients/index.hbs
index b6f0c7275..503341e44 100644
--- a/ui/app/templates/clients/index.hbs
+++ b/ui/app/templates/clients/index.hbs
@@ -1,5 +1,7 @@
 {{#global-header class="page-header"}}
-  Clients
+  <li class="is-active">
+    {{#link-to "clients.index"}}Clients{{/link-to}}
+  </li>
 {{/global-header}}
 {{#gutter-menu class="page-body"}}
   <section class="section">
diff --git a/ui/app/templates/clients/loading.hbs b/ui/app/templates/clients/loading.hbs
index 7014a5a9d..4bfa29cb2 100644
--- a/ui/app/templates/clients/loading.hbs
+++ b/ui/app/templates/clients/loading.hbs
@@ -1,5 +1,7 @@
 {{#global-header class="page-header"}}
-  Clients
+  <li class="is-active">
+    {{#link-to "clients.index"}}Clients{{/link-to}}
+  </li>
 {{/global-header}}
 {{#gutter-menu class="page-body"}}
   <section class="section has-text-centered">{{partial "partials/loading-spinner"}}</section>
diff --git a/ui/app/templates/components/global-header.hbs b/ui/app/templates/components/global-header.hbs
index 41eeba082..4d51652f0 100644
--- a/ui/app/templates/components/global-header.hbs
+++ b/ui/app/templates/components/global-header.hbs
@@ -12,11 +12,11 @@
     {{#link-to "settings.tokens" class="nav-item"}}ACL Tokens{{/link-to}}
   </div>
 </nav>
-<nav class="nav is-secondary">
-  <div class="nav-left breadcrumbs">
-    <div class="nav-item is-gutter"></div>
-    <div class="nav-item">
+<div class="nav is-secondary">
+  <div class="nav-item is-gutter"></div>
+  <nav class="breadcrumb is-large">
+    <ul>
       {{yield}}
-    </div>
-  </div>
-</nav>
+    </ul>
+  </nav>
+</div>
diff --git a/ui/app/templates/jobs/index.hbs b/ui/app/templates/jobs/index.hbs
index 71f976903..76d63662e 100644
--- a/ui/app/templates/jobs/index.hbs
+++ b/ui/app/templates/jobs/index.hbs
@@ -1,5 +1,7 @@
 {{#global-header class="page-header"}}
-  Jobs
+  <li class="is-active">
+    {{#link-to "jobs.index"}}Jobs{{/link-to}}
+  </li>
 {{/global-header}}
 {{#gutter-menu class="page-body" onNamespaceChange=(action "refresh")}}
   <section class="section">
diff --git a/ui/app/templates/jobs/job/definition.hbs b/ui/app/templates/jobs/job/definition.hbs
index f984fcbe7..51cf8345f 100644
--- a/ui/app/templates/jobs/job/definition.hbs
+++ b/ui/app/templates/jobs/job/definition.hbs
@@ -1,6 +1,8 @@
 {{#global-header class="page-header"}}
-  {{#each breadcrumbs as |breadcrumb|}}
-    {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}}
+  {{#each breadcrumbs as |breadcrumb index|}}
+    <li class="{{if (eq (inc index) breadcrumbs.length) "is-active"}}">
+      {{#link-to params=breadcrumb.args}}{{breadcrumb.label}}{{/link-to}}
+    </li>
   {{/each}}
 {{/global-header}}
 {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}}
diff --git a/ui/app/templates/jobs/job/deployments.hbs b/ui/app/templates/jobs/job/deployments.hbs
index 35afe908c..c293bfaef 100644
--- a/ui/app/templates/jobs/job/deployments.hbs
+++ b/ui/app/templates/jobs/job/deployments.hbs
@@ -1,6 +1,8 @@
 {{#global-header class="page-header"}}
-  {{#each breadcrumbs as |breadcrumb|}}
-    {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}}
+  {{#each breadcrumbs as |breadcrumb index|}}
+    <li class="{{if (eq (inc index) breadcrumbs.length) "is-active"}}">
+      {{#link-to params=breadcrumb.args}}{{breadcrumb.label}}{{/link-to}}
+    </li>
   {{/each}}
 {{/global-header}}
 {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}}
diff --git a/ui/app/templates/jobs/job/index.hbs b/ui/app/templates/jobs/job/index.hbs
index 07a83d98f..3366d4ab8 100644
--- a/ui/app/templates/jobs/job/index.hbs
+++ b/ui/app/templates/jobs/job/index.hbs
@@ -1,6 +1,8 @@
 {{#global-header class="page-header"}}
-  {{#each breadcrumbs as |breadcrumb|}}
-    {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}}
+  {{#each breadcrumbs as |breadcrumb index|}}
+    <li class="{{if (eq (inc index) breadcrumbs.length) "is-active"}}">
+      {{#link-to params=breadcrumb.args}}{{breadcrumb.label}}{{/link-to}}
+    </li>
   {{/each}}
 {{/global-header}}
 {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}}
diff --git a/ui/app/templates/jobs/job/loading.hbs b/ui/app/templates/jobs/job/loading.hbs
index 503faa81f..666de358d 100644
--- a/ui/app/templates/jobs/job/loading.hbs
+++ b/ui/app/templates/jobs/job/loading.hbs
@@ -1,6 +1,8 @@
 {{#global-header class="page-header"}}
-  {{#each breadcrumbs as |breadcrumb|}}
-    {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}}
+  {{#each breadcrumbs as |breadcrumb index|}}
+    <li class="{{if (eq (inc index) breadcrumbs.length) "is-active"}}">
+      {{#link-to params=breadcrumb.args}}{{breadcrumb.label}}{{/link-to}}
+    </li>
   {{/each}}
 {{/global-header}}
 {{#gutter-menu class="page-body"}}
diff --git a/ui/app/templates/jobs/job/task-group.hbs b/ui/app/templates/jobs/job/task-group.hbs
index 3d94ee812..679600a1a 100644
--- a/ui/app/templates/jobs/job/task-group.hbs
+++ b/ui/app/templates/jobs/job/task-group.hbs
@@ -1,13 +1,14 @@
 {{#global-header class="page-header"}}
-  {{#each breadcrumbs as |breadcrumb|}}
-    {{#link-to
-      params=(append
-        breadcrumb.args
-        (query-params jobNamespace=(or model.namespace.id "default"))
-      )
-      class="breadcrumb"}}
-      {{breadcrumb.label}}
-    {{/link-to}}
+  {{#each breadcrumbs as |breadcrumb index|}}
+    <li class="{{if (eq (inc index) breadcrumbs.length) "is-active"}}">
+      {{#link-to
+        params=(append
+          breadcrumb.args
+          (query-params jobNamespace=(or model.namespace.id "default"))
+        )}}
+        {{breadcrumb.label}}
+      {{/link-to}}
+    </li>
   {{/each}}
 {{/global-header}}
 {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}}
diff --git a/ui/app/templates/jobs/job/versions.hbs b/ui/app/templates/jobs/job/versions.hbs
index fac0992db..6aadbe617 100644
--- a/ui/app/templates/jobs/job/versions.hbs
+++ b/ui/app/templates/jobs/job/versions.hbs
@@ -1,6 +1,8 @@
 {{#global-header class="page-header"}}
-  {{#each breadcrumbs as |breadcrumb|}}
-    {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}}
+  {{#each breadcrumbs as |breadcrumb index|}}
+    <li class="{{if (eq (inc index) breadcrumbs.length) "is-active"}}">
+      {{#link-to params=breadcrumb.args}}{{breadcrumb.label}}{{/link-to}}
+    </li>
   {{/each}}
 {{/global-header}}
 {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}}
diff --git a/ui/app/templates/jobs/loading.hbs b/ui/app/templates/jobs/loading.hbs
index f754d94ff..58bc6ef5b 100644
--- a/ui/app/templates/jobs/loading.hbs
+++ b/ui/app/templates/jobs/loading.hbs
@@ -1,5 +1,7 @@
 {{#global-header class="page-header"}}
-  Jobs
+  <li class="is-active">
+    {{#link-to "jobs.index"}}Jobs{{/link-to}}
+  </li>
 {{/global-header}}
 {{#gutter-menu class="page-body"}}
   <section class="section has-text-centered">{{partial "partials/loading-spinner"}}</section>
diff --git a/ui/app/templates/servers.hbs b/ui/app/templates/servers.hbs
index 133422482..5b97959ed 100644
--- a/ui/app/templates/servers.hbs
+++ b/ui/app/templates/servers.hbs
@@ -1,6 +1,8 @@
 <div class="page-layout">
   {{#global-header class="page-header"}}
-    Servers
+    <li class="is-active">
+      {{#link-to "servers.index"}}Servers{{/link-to}}
+    </li>
   {{/global-header}}
   {{#gutter-menu class="page-body"}}
     <section class="section">
diff --git a/ui/tests/acceptance/client-detail-test.js b/ui/tests/acceptance/client-detail-test.js
index 19da35151..03e28ed6a 100644
--- a/ui/tests/acceptance/client-detail-test.js
+++ b/ui/tests/acceptance/client-detail-test.js
@@ -23,16 +23,20 @@ test('/clients/:id should have a breadrcumb trail linking back to clients', func
   visit(`/clients/${node.id}`);
 
   andThen(() => {
-    assert.equal(findAll('.breadcrumb')[0].textContent, 'Clients', 'First breadcrumb says clients');
     assert.equal(
-      findAll('.breadcrumb')[1].textContent,
+      findAll('.breadcrumb a')[0].textContent,
+      'Clients',
+      'First breadcrumb says clients'
+    );
+    assert.equal(
+      findAll('.breadcrumb a')[1].textContent,
       node.id.split('-')[0],
       'Second breadcrumb says the node short id'
     );
   });
 
   andThen(() => {
-    click(findAll('.breadcrumb')[0]);
+    click(findAll('.breadcrumb a')[0]);
   });
 
   andThen(() => {
diff --git a/ui/tests/acceptance/job-detail-test.js b/ui/tests/acceptance/job-detail-test.js
index efe84c465..758e40c91 100644
--- a/ui/tests/acceptance/job-detail-test.js
+++ b/ui/tests/acceptance/job-detail-test.js
@@ -22,14 +22,14 @@ test('visiting /jobs/:job_id', function(assert) {
 });
 
 test('breadcrumbs includes job name and link back to the jobs list', function(assert) {
-  assert.equal(findAll('.breadcrumb')[0].textContent, 'Jobs', 'First breadcrumb says jobs');
+  assert.equal(findAll('.breadcrumb a')[0].textContent, 'Jobs', 'First breadcrumb says jobs');
   assert.equal(
-    findAll('.breadcrumb')[1].textContent,
+    findAll('.breadcrumb a')[1].textContent,
     job.name,
     'Second breadcrumb says the job name'
   );
 
-  click(findAll('.breadcrumb')[0]);
+  click(findAll('.breadcrumb a')[0]);
   andThen(() => {
     assert.equal(currentURL(), '/jobs', 'First breadcrumb links back to jobs');
   });
diff --git a/ui/tests/acceptance/task-detail-test.js b/ui/tests/acceptance/task-detail-test.js
index 76beef6c8..84dd97708 100644
--- a/ui/tests/acceptance/task-detail-test.js
+++ b/ui/tests/acceptance/task-detail-test.js
@@ -36,16 +36,16 @@ test('/allocation/:id/:task_name should name the task and list high-level task i
 });
 
 test('breadcrumbs includes allocations and link to the allocation detail page', function(assert) {
-  const breadcrumbs = findAll('.breadcrumb');
+  const breadcrumbs = findAll('.breadcrumb a');
   assert.equal(
     breadcrumbs[0].textContent.trim(),
     'Allocations',
     'Allocations is the first breadcrumb'
   );
-  assert.notEqual(
-    breadcrumbs[0].tagName.toLowerCase(),
-    'a',
-    'Allocations breadcrumb is not a link'
+  assert.equal(
+    breadcrumbs[0].getAttribute('href'),
+    '#',
+    "Allocations breadcrumb doesn't link anywhere"
   );
   assert.equal(
     breadcrumbs[1].textContent.trim(),
diff --git a/ui/tests/acceptance/task-group-detail-test.js b/ui/tests/acceptance/task-group-detail-test.js
index 75404ae1e..1757f42a9 100644
--- a/ui/tests/acceptance/task-group-detail-test.js
+++ b/ui/tests/acceptance/task-group-detail-test.js
@@ -78,21 +78,25 @@ test('/jobs/:id/:task-group should list high-level metrics for the allocation',
 });
 
 test('/jobs/:id/:task-group should have breadcrumbs for job and jobs', function(assert) {
-  assert.equal(findAll('.breadcrumb')[0].textContent.trim(), 'Jobs', 'First breadcrumb says jobs');
   assert.equal(
-    findAll('.breadcrumb')[1].textContent.trim(),
+    findAll('.breadcrumb a')[0].textContent.trim(),
+    'Jobs',
+    'First breadcrumb says jobs'
+  );
+  assert.equal(
+    findAll('.breadcrumb a')[1].textContent.trim(),
     job.name,
     'Second breadcrumb says the job name'
   );
   assert.equal(
-    findAll('.breadcrumb')[2].textContent.trim(),
+    findAll('.breadcrumb a')[2].textContent.trim(),
     taskGroup.name,
     'Third breadcrumb says the job name'
   );
 });
 
 test('/jobs/:id/:task-group first breadcrumb should link to jobs', function(assert) {
-  click(findAll('.breadcrumb')[0]);
+  click(findAll('.breadcrumb a')[0]);
   andThen(() => {
     assert.equal(currentURL(), '/jobs', 'First breadcrumb links back to jobs');
   });
@@ -101,7 +105,7 @@ test('/jobs/:id/:task-group first breadcrumb should link to jobs', function(asse
 test('/jobs/:id/:task-group second breadcrumb should link to the job for the task group', function(
   assert
 ) {
-  click(findAll('.breadcrumb')[1]);
+  click(findAll('.breadcrumb a')[1]);
   andThen(() => {
     assert.equal(
       currentURL(),

From 10a9370289047e026c1d1325a10cebe996649caf Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 20 Dec 2017 07:34:46 -0800
Subject: [PATCH 21/48] Replace nav with navbar

Bulma introduced navbar while deprecating nav in 0.4.3
Bulma removed deprecated nav in 0.6.0
---
 ui/app/styles/core.scss                       |  2 +-
 ui/app/styles/core/{nav.scss => navbar.scss}  | 11 ++++++-----
 ui/app/templates/components/global-header.hbs | 18 +++++++++---------
 3 files changed, 16 insertions(+), 15 deletions(-)
 rename ui/app/styles/core/{nav.scss => navbar.scss} (90%)

diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss
index e7c657bac..e4391415b 100644
--- a/ui/app/styles/core.scss
+++ b/ui/app/styles/core.scss
@@ -22,7 +22,7 @@
 @import "./core/level";
 @import "./core/menu";
 @import "./core/message";
-@import "./core/nav";
+@import "./core/navbar";
 @import "./core/notification";
 @import "./core/pagination";
 @import "./core/progress";
diff --git a/ui/app/styles/core/nav.scss b/ui/app/styles/core/navbar.scss
similarity index 90%
rename from ui/app/styles/core/nav.scss
rename to ui/app/styles/core/navbar.scss
index b1c6d6079..87f15b13c 100644
--- a/ui/app/styles/core/nav.scss
+++ b/ui/app/styles/core/navbar.scss
@@ -1,4 +1,4 @@
-.nav {
+.navbar {
   &.is-primary {
     background: linear-gradient(
       to right,
@@ -10,12 +10,13 @@
     padding-left: 20px;
     padding-right: 20px;
 
-    .nav-item {
+    .navbar-item {
       color: rgba($primary-invert, 0.8);
       text-decoration: none;
 
       &:hover {
         color: $primary-invert;
+        background: transparent;
       }
 
       &.is-active,
@@ -24,7 +25,7 @@
         border-bottom-color: $primary-invert;
       }
 
-      + .nav-item {
+      + .navbar-item {
         position: relative;
 
         &::before {
@@ -53,12 +54,12 @@
     font-weight: $weight-semibold;
     color: $primary-invert;
 
-    .nav-item {
+    .navbar-item {
       font-size: $size-4;
     }
   }
 
-  .nav-item {
+  .navbar-item {
     &.is-gutter {
       width: $gutter-width;
     }
diff --git a/ui/app/templates/components/global-header.hbs b/ui/app/templates/components/global-header.hbs
index 4d51652f0..8996b11d4 100644
--- a/ui/app/templates/components/global-header.hbs
+++ b/ui/app/templates/components/global-header.hbs
@@ -1,19 +1,19 @@
-<nav class="nav is-primary">
-  <div class="nav-left">
-    <span class="nav-item is-logo">
+<nav class="navbar is-primary">
+  <div class="navbar-brand">
+    <span class="navbar-item is-logo">
       <img src="/ui/images/nomad-logo.svg" alt="Nomad" />
     </span>
   </div>
-  <div class="nav-right">
+  <div class="navbar-end">
     {{#if (eq config.environment "development")}}
-      {{#link-to "freestyle" class="nav-item"}}Styleguide{{/link-to}}
+      {{#link-to "freestyle" class="navbar-item"}}Styleguide{{/link-to}}
     {{/if}}
-    <a href="https://nomadproject.io/docs" class="nav-item">Documentation</a>
-    {{#link-to "settings.tokens" class="nav-item"}}ACL Tokens{{/link-to}}
+    <a href="https://nomadproject.io/docs" class="navbar-item">Documentation</a>
+    {{#link-to "settings.tokens" class="navbar-item"}}ACL Tokens{{/link-to}}
   </div>
 </nav>
-<div class="nav is-secondary">
-  <div class="nav-item is-gutter"></div>
+<div class="navbar is-secondary">
+  <div class="navbar-item is-gutter"></div>
   <nav class="breadcrumb is-large">
     <ul>
       {{yield}}

From 16522058b4a4cd746e89a7bb010b0ba4ef39d499 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 20 Dec 2017 07:37:56 -0800
Subject: [PATCH 22/48] Upgrade bulma to latest (0.6.1)

---
 ui/package.json | 2 +-
 ui/yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index 0d1b0c549..1d2afd42c 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "bulma": "0.5.0",
+    "bulma": "0.6.1",
     "core-js": "^2.4.1",
     "d3-selection": "^1.1.0",
     "d3-transition": "^1.1.0",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index d0bb75a12..398792ddc 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -1710,9 +1710,9 @@ builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
 
-bulma@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.5.0.tgz#09a7932c1c15aa7ef92840f7a50b1bfebbfd5461"
+bulma@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.6.1.tgz#5f21a77c0c06f7d80051c06628c23516081bd649"
 
 bytes@1:
   version "1.0.0"

From 8228c45ba6eaf0d55b2697aacdc4155cc2a0e9cd Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 20 Dec 2017 08:11:06 -0800
Subject: [PATCH 23/48] Specify color overrides in navbar

Bulma 0.5.2 introduced color modifiers for navbar
---
 ui/app/styles/core/navbar.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ui/app/styles/core/navbar.scss b/ui/app/styles/core/navbar.scss
index 87f15b13c..9d5929e15 100644
--- a/ui/app/styles/core/navbar.scss
+++ b/ui/app/styles/core/navbar.scss
@@ -45,6 +45,15 @@
         max-height: 26px;
       }
     }
+
+    .navbar-end > a.navbar-item {
+      color: rgba($primary-invert, 0.8);
+
+      &:hover {
+        color: $primary-invert;
+        background: transparent;
+      }
+    }
   }
 
   &.is-secondary {

From 85dff27e5dee2921b7db8891e1924ff532ffc4e9 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 20 Dec 2017 08:11:52 -0800
Subject: [PATCH 24/48] Remap $info to $blue

Bulma defaults $info to $cyan in 0.6.0
---
 ui/app/styles/core/variables.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/app/styles/core/variables.scss b/ui/app/styles/core/variables.scss
index b81a50b4e..641706168 100644
--- a/ui/app/styles/core/variables.scss
+++ b/ui/app/styles/core/variables.scss
@@ -9,6 +9,7 @@ $primary: $nomad-green;
 $warning: $orange;
 $warning-invert: $white;
 $danger: $red;
+$info: $blue;
 $dark: #234;
 
 $radius: 2px;

From 13e63ea1d5fdca2ebf3559f3c842a3bbe6a206a0 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 20 Dec 2017 08:12:53 -0800
Subject: [PATCH 25/48] Strengthen the .tag override selector

In 0.5.2, Bulma excludes the body element from the selector to work around
an issue with Wordpress.
---
 ui/app/styles/core/tag.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/app/styles/core/tag.scss b/ui/app/styles/core/tag.scss
index de4f25c74..cbf2bbe3b 100644
--- a/ui/app/styles/core/tag.scss
+++ b/ui/app/styles/core/tag.scss
@@ -1,4 +1,6 @@
-.tag {
+// Strange selector mirrors selector used in Bulma
+// https://github.com/jgthms/bulma/issues/912
+.tag:not(body) {
   text-transform: uppercase;
   border-radius: 200px;
   font-weight: $weight-normal;

From 0f06032fd7a343f65d14ca13103d25e4d25c3c8d Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 20 Dec 2017 08:28:27 -0800
Subject: [PATCH 26/48] Upgrade ember-cli-sass

---
 ui/package.json |  2 +-
 ui/yarn.lock    | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index 1d2afd42c..ac7ecf9c3 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -45,7 +45,7 @@
     "ember-cli-mirage": "^0.4.1",
     "ember-cli-moment-shim": "^3.5.0",
     "ember-cli-qunit": "^4.0.0",
-    "ember-cli-sass": "^6.2.0",
+    "ember-cli-sass": "^7.1.2",
     "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-string-helpers": "^1.5.0",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 398792ddc..6a93020a6 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -1461,6 +1461,17 @@ broccoli-sass-source-maps@^2.0.0:
     object-assign "^2.0.0"
     rsvp "^3.0.6"
 
+broccoli-sass-source-maps@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.1.1.tgz#5d71d3734234acb102000e5d7776d4c722aad756"
+  dependencies:
+    broccoli-caching-writer "^3.0.3"
+    include-path-searcher "^0.1.0"
+    mkdirp "^0.3.5"
+    node-sass "^4.1.0"
+    object-assign "^2.0.0"
+    rsvp "^3.0.6"
+
 broccoli-slow-trees@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-3.0.1.tgz#9bf2a9e2f8eb3ed3a3f2abdde988da437ccdc9b4"
@@ -2887,7 +2898,7 @@ ember-cli-qunit@^4.0.0:
     resolve "^1.1.6"
     silent-error "^1.0.0"
 
-ember-cli-sass@^6.1.3, ember-cli-sass@^6.2.0:
+ember-cli-sass@^6.1.3:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-6.2.0.tgz#e1f81289678e1e22d9cf9dbf7fa2de76a0de9a2f"
   dependencies:
@@ -2897,6 +2908,16 @@ ember-cli-sass@^6.1.3, ember-cli-sass@^6.2.0:
     ember-cli-version-checker "^1.0.2"
     merge "^1.2.0"
 
+ember-cli-sass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-7.1.2.tgz#5756a92a526754878b32f3be4367cfe4bf2b5514"
+  dependencies:
+    broccoli-funnel "^1.0.0"
+    broccoli-merge-trees "^1.1.0"
+    broccoli-sass-source-maps "^2.1.0"
+    ember-cli-babel "^6.6.0"
+    ember-cli-version-checker "^1.0.2"
+
 ember-cli-shims@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ember-cli-shims/-/ember-cli-shims-1.2.0.tgz#0f53aff0aab80b5f29da3a9731bac56169dd941f"

From 96752ec100c4ff5dc72cd3912fd8678d969e706b Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Fri, 5 Jan 2018 12:29:57 -0800
Subject: [PATCH 27/48] Adds the ember-test-selectors addon

---
 ui/package.json |  1 +
 ui/yarn.lock    | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ui/package.json b/ui/package.json
index ac7ecf9c3..5ae3fa696 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -65,6 +65,7 @@
     "ember-resolver": "^4.5.0",
     "ember-sinon": "^0.7.0",
     "ember-source": "~2.17.0",
+    "ember-test-selectors": "^0.3.8",
     "ember-truth-helpers": "^2.0.0",
     "ember-welcome-page": "^3.0.0",
     "eslint": "^4.13.1",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 6a93020a6..016fbf6bf 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -1492,7 +1492,7 @@ broccoli-sri-hash@^2.1.0:
     sri-toolbox "^0.2.0"
     symlink-or-copy "^1.0.1"
 
-broccoli-stew@^1.2.0, broccoli-stew@^1.3.3, broccoli-stew@^1.4.2, broccoli-stew@^1.5.0:
+broccoli-stew@^1.2.0, broccoli-stew@^1.3.3, broccoli-stew@^1.4.0, broccoli-stew@^1.4.2, broccoli-stew@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.5.0.tgz#d7af8c18511dce510e49d308a62e5977f461883c"
   dependencies:
@@ -3373,6 +3373,14 @@ ember-test-helpers@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/ember-test-helpers/-/ember-test-helpers-0.6.3.tgz#f864cdf6f4e75f3f8768d6537785b5ab6e82d907"
 
+ember-test-selectors@^0.3.8:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-0.3.8.tgz#1e8ae3e78c64bacc4bbfe87f9973c85805699db2"
+  dependencies:
+    broccoli-stew "^1.4.0"
+    ember-cli-babel "^6.8.2"
+    ember-cli-version-checker "^2.0.0"
+
 ember-text-measurer@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/ember-text-measurer/-/ember-text-measurer-0.4.0.tgz#a676195378d4eb4c1617678c2d198a2344b4d12b"

From 4c369075057e2442f67685f01b7bd2423a9a1836 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Fri, 5 Jan 2018 12:59:36 -0800
Subject: [PATCH 28/48] Use data-test- selectors in acceptance tests

---
 .../allocations/allocation/index.hbs          |  22 +--
 .../allocations/allocation/task/index.hbs     |  34 ++--
 .../allocations/allocation/task/logs.hbs      |   2 +-
 ui/app/templates/application.hbs              |  20 +--
 ui/app/templates/clients/client.hbs           |  29 +--
 ui/app/templates/clients/index.hbs            |  10 +-
 .../templates/components/allocation-row.hbs   |  22 +--
 .../templates/components/client-node-row.hbs  |  14 +-
 ui/app/templates/components/gutter-menu.hbs   |   1 +
 .../templates/components/job-deployment.hbs   |  12 +-
 .../job-deployment/deployment-allocations.hbs |   4 +-
 .../job-deployment/deployment-metrics.hbs     |  12 +-
 .../components/job-deployment/task-groups.hbs |  19 +-
 .../components/job-deployments-stream.hbs     |   4 +-
 ui/app/templates/components/job-row.hbs       |  12 +-
 ui/app/templates/components/job-version.hbs   |   8 +-
 .../components/job-versions-stream.hbs        |   4 +-
 .../templates/components/server-agent-row.hbs |  12 +-
 .../templates/components/task-group-row.hbs   |  12 +-
 ui/app/templates/jobs/index.hbs               |  10 +-
 ui/app/templates/jobs/job/definition.hbs      |   2 +-
 ui/app/templates/jobs/job/index.hbs           |  40 ++---
 ui/app/templates/jobs/job/subnav.hbs          |   8 +-
 ui/app/templates/jobs/job/task-group.hbs      |  15 +-
 .../templates/partials/forbidden-message.hbs  |   6 +-
 ui/app/templates/servers.hbs                  |   2 +-
 ui/app/templates/servers/server.hbs           |   2 +-
 ui/app/templates/settings/tokens.hbs          |  24 ++-
 ui/tests/acceptance/allocation-detail-test.js |  31 ++--
 .../acceptance/application-errors-test.js     |  10 +-
 ui/tests/acceptance/client-detail-test.js     |  68 ++++---
 ui/tests/acceptance/job-definition-test.js    |   2 +-
 ui/tests/acceptance/job-deployments-test.js   | 142 +++++++--------
 ui/tests/acceptance/job-detail-test.js        | 166 ++++++++----------
 ui/tests/acceptance/job-versions-test.js      |  13 +-
 ui/tests/acceptance/jobs-list-test.js         |  62 ++++---
 ui/tests/acceptance/namespaces-test.js        |   8 +-
 ui/tests/acceptance/nodes-list-test.js        | 109 ++++++++----
 ui/tests/acceptance/server-detail-test.js     |  20 ++-
 ui/tests/acceptance/task-detail-test.js       |  73 +++-----
 ui/tests/acceptance/task-group-detail-test.js |  75 +++-----
 ui/tests/acceptance/task-logs-test.js         |   2 +-
 ui/tests/acceptance/token-test.js             |  66 ++++---
 43 files changed, 604 insertions(+), 605 deletions(-)

diff --git a/ui/app/templates/allocations/allocation/index.hbs b/ui/app/templates/allocations/allocation/index.hbs
index 8c12406d4..9778b2637 100644
--- a/ui/app/templates/allocations/allocation/index.hbs
+++ b/ui/app/templates/allocations/allocation/index.hbs
@@ -6,20 +6,20 @@
 {{/global-header}}
 {{#gutter-menu class="page-body"}}
   <section class="section">
-    <h1 class="title">
+    <h1 data-test-title class="title">
       Allocation {{model.name}}
       <span class="bumper-left tag {{model.statusClass}}">{{model.clientStatus}}</span>
       <span class="tag is-hollow is-small no-text-transform">{{model.id}}</span>
     </h1>
 
     <div class="boxed-section is-small">
-      <div class="boxed-section-body inline-definitions">
+      <div data-test-allocation-details class="boxed-section-body inline-definitions">
         <span class="label">Allocation Details</span>
         <span class="pair job-link"><span class="term">Job</span>
-          {{#link-to "jobs.job" model.job (query-params jobNamespace=model.job.namespace.id)}}{{model.job.name}}{{/link-to}}
+          {{#link-to "jobs.job" model.job (query-params jobNamespace=model.job.namespace.id) data-test-job-link}}{{model.job.name}}{{/link-to}}
         </span>
         <span class="pair node-link"><span class="term">Client</span>
-          {{#link-to "clients.client" model.node}}{{model.node.shortId}}{{/link-to}}
+          {{#link-to "clients.client" model.node data-test-client-link}}{{model.node.shortId}}{{/link-to}}
         </span>
       </div>
     </div>
@@ -33,7 +33,7 @@
           source=sortedStates
           sortProperty=sortProperty
           sortDescending=sortDescending
-          class="is-striped tasks" as |t|}}
+          class="is-striped" as |t|}}
           {{#t.head}}
             {{#t.sort-by prop="name"}}Name{{/t.sort-by}}
             {{#t.sort-by prop="state"}}State{{/t.sort-by}}
@@ -42,22 +42,22 @@
             <th>Addresses</th>
           {{/t.head}}
           {{#t.body as |row|}}
-            <tr>
-              <td>
+            <tr data-test-task-row={{row.model.task.name}}>
+              <td data-test-name>
                 {{#link-to "allocations.allocation.task" row.model.allocation row.model}}
                   {{row.model.task.name}}
                 {{/link-to}}
               </td>
-              <td>{{row.model.state}}</td>
-              <td>
+              <td data-test-state>{{row.model.state}}</td>
+              <td data-test-message>
                 {{#if row.model.events.lastObject.displayMessage}}
                   {{row.model.events.lastObject.displayMessage}}
                 {{else}}
                   <em>No message</em>
                 {{/if}}
               </td>
-              <td>{{moment-format row.model.events.lastObject.time "MM/DD/YY HH:mm:ss"}}</td>
-              <td>
+              <td data-test-time>{{moment-format row.model.events.lastObject.time "MM/DD/YY HH:mm:ss"}}</td>
+              <td data-test-ports>
                 <ul>
                   {{#each row.model.resources.networks.firstObject.reservedPorts as |port|}}
                     <li>
diff --git a/ui/app/templates/allocations/allocation/task/index.hbs b/ui/app/templates/allocations/allocation/task/index.hbs
index f7d646a54..aebe8eeed 100644
--- a/ui/app/templates/allocations/allocation/task/index.hbs
+++ b/ui/app/templates/allocations/allocation/task/index.hbs
@@ -1,12 +1,12 @@
 {{#global-header class="page-header"}}
-  <li><a href="#">Allocations</a></li>
+  <li><a href="#" data-test-breadcrumb="allocations">Allocations</a></li>
   <li>
-    {{#link-to "allocations.allocation" model.allocation}}
+    {{#link-to "allocations.allocation" model.allocation data-test-breadcrumb="allocation"}}
       {{model.allocation.shortId}}
     {{/link-to}}
   </li>
   <li class="is-active">
-    {{#link-to "allocations.allocation.task" model.allocation model}}
+    {{#link-to "allocations.allocation.task" model.allocation model data-test-breadcrumb="task"}}
       {{model.name}}
     {{/link-to}}
   </li>
@@ -14,15 +14,15 @@
 {{#gutter-menu class="page-body"}}
   {{partial "allocations/allocation/task/subnav"}}
   <section class="section">
-    <h1 class="title">
+    <h1 class="title" data-test-title>
       {{model.name}}
-      <span class="bumper-left tag {{model.stateClass}}">{{model.state}}</span>
+      <span class="bumper-left tag {{model.stateClass}}" data-test-state>{{model.state}}</span>
     </h1>
 
     <div class="boxed-section is-small">
       <div class="boxed-section-body inline-definitions">
         <span class="label">Task Details</span>
-        <span class="pair">
+        <span class="pair" data-test-started-at>
           <span class="term">Started At</span>
           {{moment-format model.startedAt "MM/DD/YY HH:mm:ss"}}
         </span>
@@ -40,22 +40,22 @@
     </div>
 
     {{#if ports.length}}
-      <div class="boxed-section">
+      <div class="boxed-section" data-test-task-addresses>
         <div class="boxed-section-head">
           Addresses
         </div>
         <div class="boxed-section-body is-full-bleed">
-          {{#list-table source=ports class="addresses-list" as |t|}}
+          {{#list-table source=ports as |t|}}
             {{#t.head}}
               <th class="is-1">Dynamic?</th>
               <th class="is-2">Name</th>
               <th>Address</th>
             {{/t.head}}
             {{#t.body as |row|}}
-              <tr>
-                <td>{{if row.model.isDynamic "Yes" "No"}}</td>
-                <td>{{row.model.name}}</td>
-                <td>
+              <tr data-test-task-address>
+                <td data-test-task-address-is-dynamic>{{if row.model.isDynamic "Yes" "No"}}</td>
+                <td data-test-task-address-name>{{row.model.name}}</td>
+                <td data-test-task-address-address>
                   <a href="http://{{model.allocation.node.address}}:{{row.model.port}}" target="_blank">
                     {{model.allocation.node.address}}:{{row.model.port}}
                   </a>
@@ -72,17 +72,17 @@
         Recent Events
       </div>
       <div class="boxed-section-body is-full-bleed">
-        {{#list-table source=(reverse model.events) class="is-striped task-events" as |t|}}
+        {{#list-table source=(reverse model.events) class="is-striped" as |t|}}
           {{#t.head}}
             <th class="is-3">Time</th>
             <th class="is-1">Type</th>
             <th>Description</th>
           {{/t.head}}
           {{#t.body as |row|}}
-            <tr>
-              <td>{{moment-format row.model.time "MM/DD/YY HH:mm:ss"}}</td>
-              <td>{{row.model.type}}</td>
-              <td>
+            <tr data-test-task-event>
+              <td data-test-task-event-time>{{moment-format row.model.time "MM/DD/YY HH:mm:ss"}}</td>
+              <td data-test-task-event-type>{{row.model.type}}</td>
+              <td data-test-task-event-message>
                 {{#if row.model.displayMessage}}
                   {{row.model.displayMessage}}
                 {{else}}
diff --git a/ui/app/templates/allocations/allocation/task/logs.hbs b/ui/app/templates/allocations/allocation/task/logs.hbs
index 5628e69fc..01a7440cf 100644
--- a/ui/app/templates/allocations/allocation/task/logs.hbs
+++ b/ui/app/templates/allocations/allocation/task/logs.hbs
@@ -14,6 +14,6 @@
 {{#gutter-menu class="page-body"}}
   {{partial "allocations/allocation/task/subnav"}}
   <section class="section">
-    {{task-log allocation=model.allocation task=model.name}}
+    {{task-log data-test-task-log allocation=model.allocation task=model.name}}
   </section>
 {{/gutter-menu}}
diff --git a/ui/app/templates/application.hbs b/ui/app/templates/application.hbs
index 2ee39614a..8d1a11672 100644
--- a/ui/app/templates/application.hbs
+++ b/ui/app/templates/application.hbs
@@ -3,23 +3,23 @@
   {{outlet}}
 {{else}}
   <div class="error-container">
-    <div class="error-message">
+    <div data-test-error class="error-message">
       {{#if is500}}
-        <h1 class="title is-spaced">Server Error</h1>
-        <p class="subtitle">A server error prevented data from being sent to the client.</p>
+        <h1 data-test-error-title class="title is-spaced">Server Error</h1>
+        <p data-test-error-message class="subtitle">A server error prevented data from being sent to the client.</p>
       {{else if is404}}
-        <h1 class="title is-spaced">Not Found</h1>
-        <p class="subtitle">What you're looking for couldn't be found. It either doesn't exist or you are not authorized to see it.</p>
+        <h1 data-test-error-title class="title is-spaced">Not Found</h1>
+        <p data-test-error-message class="subtitle">What you're looking for couldn't be found. It either doesn't exist or you are not authorized to see it.</p>
       {{else if is403}}
-        <h1 class="title is-spaced">Not Authorized</h1>
+        <h1 data-test-error-title class="title is-spaced">Not Authorized</h1>
         {{#if token.secret}}
-          <p class="subtitle">Your {{#link-to "settings.tokens"}}ACL token{{/link-to}} does not provide the required permissions. Contact your administrator if this is an error.</p>
+          <p data-test-error-message class="subtitle">Your {{#link-to "settings.tokens" data-test-error-acl-link}}ACL token{{/link-to}} does not provide the required permissions. Contact your administrator if this is an error.</p>
         {{else}}
-          <p class="subtitle">Provide an {{#link-to "settings.tokens"}}ACL token{{/link-to}} with requisite permissions to view this.</p>
+          <p data-test-error-message class="subtitle">Provide an {{#link-to "settings.tokens" data-test-error-acl-link}}ACL token{{/link-to}} with requisite permissions to view this.</p>
         {{/if}}
       {{else}}
-        <h1 class="title is-spaced">Error</h1>
-        <p class="subtitle">Something went wrong.</p>
+        <h1 data-test-error-title class="title is-spaced">Error</h1>
+        <p data-test-error-message class="subtitle">Something went wrong.</p>
       {{/if}}
       {{#if (eq config.environment "development")}}
         <pre class="error-stack-trace"><code>{{errorStr}}</code></pre>
diff --git a/ui/app/templates/clients/client.hbs b/ui/app/templates/clients/client.hbs
index 228f30100..09423d9d4 100644
--- a/ui/app/templates/clients/client.hbs
+++ b/ui/app/templates/clients/client.hbs
@@ -1,13 +1,15 @@
 {{#global-header class="page-header"}}
-  <li>{{#link-to "clients.index"}}Clients{{/link-to}}</li>
+  <li>
+    {{#link-to "clients.index" data-test-breadcrumb="clients"}}Clients{{/link-to}}
+  </li>
   <li class="is-active">
-    {{#link-to "clients.client" model.id}}{{model.shortId}}{{/link-to}}
+    {{#link-to "clients.client" model.id data-test-breadcrumb="client"}}{{model.shortId}}{{/link-to}}
   </li>
 {{/global-header}}
 {{#gutter-menu class="page-body"}}
   <section class="section">
-    <h1 class="title">
-      <span class="node-status-light {{model.status}}"></span>
+    <h1 data-test-title class="title">
+      <span data-test-node-status="{{model.status}}" class="node-status-light {{model.status}}"></span>
       {{or model.name model.shortId}}
       <span class="tag is-hollow is-small no-text-transform">{{model.id}}</span>
     </h1>
@@ -15,9 +17,9 @@
     <div class="boxed-section is-small">
       <div class="boxed-section-body inline-definitions">
         <span class="label">Client Details</span>
-        <span class="pair"><span class="term">Status</span> <span class="status-text node-{{model.status}}">{{model.status}}</span></span>
-        <span class="pair"><span class="term">Address</span> {{model.httpAddr}}</span>
-        <span class="pair"><span class="term">Datacenter</span> {{model.datacenter}}</span>
+        <span class="pair" data-test-status-definition><span class="term">Status</span> <span class="status-text node-{{model.status}}">{{model.status}}</span></span>
+        <span class="pair" data-test-address-definition><span class="term">Address</span> {{model.httpAddr}}</span>
+        <span class="pair" data-test-datacenter-definition><span class="term">Datacenter</span> {{model.datacenter}}</span>
       </div>
     </div>
 
@@ -39,7 +41,7 @@
             source=p.list
             sortProperty=sortProperty
             sortDescending=sortDescending
-            class="allocations with-foot" as |t|}}
+            class="with-foot" as |t|}}
             {{#t.head}}
               {{#t.sort-by prop="shortId"}}ID{{/t.sort-by}}
               {{#t.sort-by prop="modifyIndex" title="Modify Index"}}Modified{{/t.sort-by}}
@@ -51,7 +53,11 @@
               <th>Memory</th>
             {{/t.head}}
             {{#t.body as |row|}}
-              {{allocation-row allocation=row.model context="node" onClick=(action "gotoAllocation" row.model)}}
+              {{allocation-row
+                allocation=row.model
+                context="node"
+                onClick=(action "gotoAllocation" row.model)
+                data-test-allocation=row.model.id}}
             {{/t.body}}
           {{/list-table}}
           <div class="table-foot">
@@ -73,7 +79,10 @@
         Attributes
       </div>
       <div class="boxed-section-body is-full-bleed">
-        {{attributes-table attributes=model.attributes.attributesStructured class="attributes-table"}}
+        {{attributes-table
+          data-test-attributes
+          attributes=model.attributes.attributesStructured
+          class="attributes-table"}}
       </div>
     </div>
   </section>
diff --git a/ui/app/templates/clients/index.hbs b/ui/app/templates/clients/index.hbs
index 503341e44..1b43c78c3 100644
--- a/ui/app/templates/clients/index.hbs
+++ b/ui/app/templates/clients/index.hbs
@@ -32,11 +32,11 @@
             <th># Allocs</th>
           {{/t.head}}
           {{#t.body as |row|}}
-            {{client-node-row node=row.model onClick=(action "gotoNode" row.model)}}
+            {{client-node-row data-test-client-node-row node=row.model onClick=(action "gotoNode" row.model)}}
           {{/t.body}}
         {{/list-table}}
         <div class="table-foot">
-          <nav class="pagination">
+          <nav class="pagination" data-test-pagination>
             <div class="pagination-numbers">
               {{p.startsAt}}&ndash;{{p.endsAt}} of {{sortedNodes.length}}
             </div>
@@ -46,14 +46,14 @@
           </nav>
         </div>
       {{else}}
-        <div class="empty-message">
+        <div class="empty-message" data-test-empty-clients-list>
           {{#if (eq nodes.length 0)}}
-            <h3 class="empty-message-headline">No Clients</h3>
+            <h3 class="empty-message-headline" data-test-empty-clients-list-headline>No Clients</h3>
             <p class="empty-message-body">
               The cluster currently has no client nodes.
             </p>
           {{else if searchTerm}}
-            <h3 class="empty-message-headline">No Matches</h3>
+            <h3 class="empty-message-headline" data-test-empty-clients-list-headline>No Matches</h3>
             <p class="empty-message-body">No clients match the term <strong>{{searchTerm}}</strong></p>
           {{/if}}
         </div>
diff --git a/ui/app/templates/components/allocation-row.hbs b/ui/app/templates/components/allocation-row.hbs
index 0820dfeb5..7656960e5 100644
--- a/ui/app/templates/components/allocation-row.hbs
+++ b/ui/app/templates/components/allocation-row.hbs
@@ -1,28 +1,28 @@
-<td>
+<td data-test-short-id>
   {{#link-to "allocations.allocation" allocation class="is-primary"}}
     {{allocation.shortId}}
   {{/link-to}}
 </td>
-<td>{{moment-format allocation.modifyTime "MM/DD HH:mm:ss"}}</td>
-<td>{{allocation.name}}</td>
-<td>
+<td data-test-modify-time>{{moment-format allocation.modifyTime "MM/DD HH:mm:ss"}}</td>
+<td data-test-name>{{allocation.name}}</td>
+<td data-test-client-status>
   <span class="color-swatch {{allocation.clientStatus}}" /> {{allocation.clientStatus}}
 </td>
 {{#if (eq context "job")}}
-  <td>{{allocation.jobVersion}}</td>
-  <td>{{#link-to "clients.client" allocation.node}}{{allocation.node.shortId}}{{/link-to}}</td>
+  <td data-test-job-version>{{allocation.jobVersion}}</td>
+  <td data-test-client>{{#link-to "clients.client" allocation.node}}{{allocation.node.shortId}}{{/link-to}}</td>
 {{else if (eq context "node")}}
   <td>
     {{#if (or allocation.job.isPending allocation.job.isReloading)}}
       ...
     {{else}}
-      {{#link-to "jobs.job" allocation.job (query-params jobNamespace=allocation.job.namespace.id)}}{{allocation.job.name}}{{/link-to}}
-      <span class="is-faded">/ {{allocation.taskGroup.name}}</span>
+      {{#link-to "jobs.job" allocation.job (query-params jobNamespace=allocation.job.namespace.id) data-test-job}}{{allocation.job.name}}{{/link-to}}
+      <span class="is-faded" data-test-task-group>/ {{allocation.taskGroup.name}}</span>
     {{/if}}
   </td>
-  <td>{{allocation.jobVersion}}</td>
+  <td data-test-job-version>{{allocation.jobVersion}}</td>
 {{/if}}
-<td class="has-text-centered">
+<td data-test-cpu class="has-text-centered">
   {{#if allocation.stats.isPending}}
     ...
   {{else if allocation.stats.isRejected}}
@@ -40,7 +40,7 @@
     </div>
   {{/if}}
 </td>
-<td class="has-text-centered">
+<td data-test-mem class="has-text-centered">
   {{#if allocation.stats.isPending}}
     ...
   {{else if allocation.stats.isRejected}}
diff --git a/ui/app/templates/components/client-node-row.hbs b/ui/app/templates/components/client-node-row.hbs
index b6eb25413..184a00e2b 100644
--- a/ui/app/templates/components/client-node-row.hbs
+++ b/ui/app/templates/components/client-node-row.hbs
@@ -1,10 +1,10 @@
-<td>{{#link-to "clients.client" node.id class="is-primary"}}{{node.shortId}}{{/link-to}}</td>
-<td class="is-200px is-truncatable" title="{{node.name}}">{{node.name}}</td>
-<td>{{node.status}}</td>
-<td>{{node.address}}</td>
-<td>{{node.port}}</td>
-<td>{{node.datacenter}}</td>
-<td>
+<td data-test-client-id>{{#link-to "clients.client" node.id class="is-primary"}}{{node.shortId}}{{/link-to}}</td>
+<td data-test-client-name class="is-200px is-truncatable" title="{{node.name}}">{{node.name}}</td>
+<td data-test-client-status>{{node.status}}</td>
+<td data-test-client-address>{{node.address}}</td>
+<td data-test-client-port>{{node.port}}</td>
+<td data-test-client-datacenter>{{node.datacenter}}</td>
+<td data-test-client-allocations>
   {{#if node.allocations.isPending}}
     ...
   {{else}}
diff --git a/ui/app/templates/components/gutter-menu.hbs b/ui/app/templates/components/gutter-menu.hbs
index 765b53ab9..055e8e323 100644
--- a/ui/app/templates/components/gutter-menu.hbs
+++ b/ui/app/templates/components/gutter-menu.hbs
@@ -9,6 +9,7 @@
           <li>
             <div class="menu-item">
               {{#power-select
+                data-test-namespace-switcher
                 options=sortedNamespaces
                 selected=system.activeNamespace
                 searchField="name"
diff --git a/ui/app/templates/components/job-deployment.hbs b/ui/app/templates/components/job-deployment.hbs
index 2d7a4cfd2..ad24f628f 100644
--- a/ui/app/templates/components/job-deployment.hbs
+++ b/ui/app/templates/components/job-deployment.hbs
@@ -1,20 +1,20 @@
 <div class="boxed-section-head is-light inline-definitions">
   <span>{{deployment.shortId}}</span>
-  <span class="bumper-left tag {{deployment.statusClass}}">{{deployment.status}}</span>
+  <span class="bumper-left tag {{deployment.statusClass}}" data-test-deployment-status="{{deployment.statusClass}}">{{deployment.status}}</span>
   {{#if deployment.requiresPromotion}}
-    <span class="bumper-left badge is-warning is-hollow">Requires Promotion</span>
+    <span data-test-promotion-required class="bumper-left badge is-warning is-hollow">Requires Promotion</span>
   {{/if}}
   <span class="pull-right">
     <span class="pair is-faded">
       <span class="term">Version</span>
-      <span class="has-emphasis">#{{deployment.version.number}}</span>
-      <span>| {{moment-from-now deployment.version.submitTime}}</span>
+      <span class="has-emphasis" data-test-deployment-version>#{{deployment.version.number}}</span>
+      <span data-test-deployment-submit-time>| {{moment-from-now deployment.version.submitTime}}</span>
     </span>
-    <button class="button is-light is-compact pull-right" {{action (toggle "isOpen" this)}}>details</button>
+    <button data-test-deployment-toggle-details class="button is-light is-compact pull-right" {{action (toggle "isOpen" this)}}>details</button>
  </span>
 </div>
 {{#if isOpen}}
-  <div class="boxed-section-body">
+  <div data-test-deployment-details class="boxed-section-body">
     {{#job-deployment-details deployment=deployment as |d|}}
       {{d.metrics}}
       {{d.taskGroups}}
diff --git a/ui/app/templates/components/job-deployment/deployment-allocations.hbs b/ui/app/templates/components/job-deployment/deployment-allocations.hbs
index 938f0e79e..f42afdb83 100644
--- a/ui/app/templates/components/job-deployment/deployment-allocations.hbs
+++ b/ui/app/templates/components/job-deployment/deployment-allocations.hbs
@@ -1,4 +1,4 @@
-<div class="boxed-section">
+<div data-test-deployment-allocations class="boxed-section">
   <div class="boxed-section-head">
     Allocations
   </div>
@@ -17,7 +17,7 @@
         <th>Memory</th>
       {{/t.head}}
       {{#t.body as |row|}}
-        {{allocation-row allocation=row.model context="job"}}
+        {{allocation-row data-test-deployment-allocation allocation=row.model context="job"}}
       {{/t.body}}
     {{/list-table}}
   </div>
diff --git a/ui/app/templates/components/job-deployment/deployment-metrics.hbs b/ui/app/templates/components/job-deployment/deployment-metrics.hbs
index dae3390ab..a3c3ff585 100644
--- a/ui/app/templates/components/job-deployment/deployment-metrics.hbs
+++ b/ui/app/templates/components/job-deployment/deployment-metrics.hbs
@@ -3,37 +3,37 @@
     <div class="metric-group">
       <div class="metric {{if (eq deployment.placedCanaries deployment.desiredCanaries) "is-primary"}} {{if (eq deployment.desiredCanaries 0) "is-faded"}}">
         <h3 class="label">Canaries</h3>
-        <p class="value">{{deployment.placedCanaries}} / {{deployment.desiredCanaries}}</p>
+        <p data-test-deployment-metric="canaries" class="value">{{deployment.placedCanaries}} / {{deployment.desiredCanaries}}</p>
       </div>
     </div>
 
     <div class="metric-group">
       <div class="metric">
         <h3 class="label">Placed</h3>
-        <p class="value">{{deployment.placedAllocs}}</p>
+        <p data-test-deployment-metric="placed" class="value">{{deployment.placedAllocs}}</p>
       </div>
       <div class="metric">
         <h3 class="label">Desired</h3>
-        <p class="value">{{deployment.desiredTotal}}</p>
+        <p data-test-deployment-metric="desired" class="value">{{deployment.desiredTotal}}</p>
       </div>
     </div>
 
     <div class="metric-group">
       <div class="metric {{if (gt deployment.healthyAllocs 0) "is-primary" "is-faded"}}">
         <h3 class="label">Healthy</h3>
-        <p class="value">{{deployment.healthyAllocs}}</p>
+        <p data-test-deployment-metric="healthy" class="value">{{deployment.healthyAllocs}}</p>
       </div>
     </div>
 
     <div class="metric-group">
       <div class="metric {{if (gt deployment.unhealthyAllocs 0) "is-danger" "is-faded"}}">
         <h3 class="label">Unhealthy</h3>
-        <p class="value">{{deployment.unhealthyAllocs}}</p>
+        <p data-test-deployment-metric="unhealthy" class="value">{{deployment.unhealthyAllocs}}</p>
       </div>
     </div>
   </div>
   <div class="column">
-    <div class="notification {{deployment.statusClass}}">
+    <div data-test-deployment-notification class="notification {{deployment.statusClass}}">
       {{deployment.statusDescription}}
     </div>
   </div>
diff --git a/ui/app/templates/components/job-deployment/task-groups.hbs b/ui/app/templates/components/job-deployment/task-groups.hbs
index 1b0ebcc76..cee10994c 100644
--- a/ui/app/templates/components/job-deployment/task-groups.hbs
+++ b/ui/app/templates/components/job-deployment/task-groups.hbs
@@ -1,9 +1,10 @@
-<div class="boxed-section">
+<div data-test-deployment-task-groups class="boxed-section">
   <div class="boxed-section-head">
     Task Groups
   </div>
   <div class="boxed-section-body is-full-bleed">
     {{#list-table
+      data-test-deployment-task-groups
       source=deployment.taskGroupSummaries
       class="task-groups" as |t|}}
       {{#t.head}}
@@ -16,20 +17,20 @@
         <th>Unhealthy Allocs</th>
       {{/t.head}}
       {{#t.body as |row|}}
-        <tr>
-          <td>{{row.model.name}}</td>
-          <td>
+        <tr data-test-deployment-task-group>
+          <td data-test-deployment-task-group-name>{{row.model.name}}</td>
+          <td data-test-deployment-task-group-promotion>
             {{#if row.model.requiresPromotion}}
               {{if row.model.promoted "No" "Yes"}}
             {{else}}
               N/A
             {{/if}}
           </td>
-          <td>{{if row.model.autoRevert "Yes" "No"}}</td>
-          <td>{{or row.model.placedCanaries 0}} / {{row.model.desiredCanaries}}</td>
-          <td>{{row.model.placedAllocs}} / {{row.model.desiredTotal}}</td>
-          <td>{{row.model.healthyAllocs}}</td>
-          <td>{{row.model.unhealthyAllocs}}</td>
+          <td data-test-deployment-task-group-auto-revert>{{if row.model.autoRevert "Yes" "No"}}</td>
+          <td data-test-deployment-task-group-canaries>{{or row.model.placedCanaries 0}} / {{row.model.desiredCanaries}}</td>
+          <td data-test-deployment-task-group-allocs>{{row.model.placedAllocs}} / {{row.model.desiredTotal}}</td>
+          <td data-test-deployment-task-group-healthy>{{row.model.healthyAllocs}}</td>
+          <td data-test-deployment-task-group-unhealthy>{{row.model.unhealthyAllocs}}</td>
         </tr>
       {{/t.body}}
     {{/list-table}}
diff --git a/ui/app/templates/components/job-deployments-stream.hbs b/ui/app/templates/components/job-deployments-stream.hbs
index b92050b13..cf89df615 100644
--- a/ui/app/templates/components/job-deployments-stream.hbs
+++ b/ui/app/templates/components/job-deployments-stream.hbs
@@ -1,6 +1,6 @@
 {{#each annotatedDeployments as |record|}}
   {{#if record.meta.showDate}}
-    <li class="timeline-note">
+    <li data-test-deployment-time class="timeline-note">
       {{#if record.deployment.version.submitTime}}
         {{moment-format record.deployment.version.submitTime "MMMM D, YYYY"}}
       {{else}}
@@ -8,7 +8,7 @@
       {{/if}}
     </li>
   {{/if}}
-  <li class="timeline-object">
+  <li data-test-deployment class="timeline-object">
     {{job-deployment deployment=record.deployment}}
   </li>
 {{/each}}
diff --git a/ui/app/templates/components/job-row.hbs b/ui/app/templates/components/job-row.hbs
index f18fcd3be..54032c664 100644
--- a/ui/app/templates/components/job-row.hbs
+++ b/ui/app/templates/components/job-row.hbs
@@ -1,16 +1,16 @@
-<td>{{#link-to "jobs.job" job class="is-primary"}}{{job.name}}{{/link-to}}</td>
-<td>
+<td data-test-job-name>{{#link-to "jobs.job" job class="is-primary"}}{{job.name}}{{/link-to}}</td>
+<td data-test-job-status>
   <span class="tag {{job.statusClass}}">{{job.status}}</span>
 </td>
-<td>{{job.type}}</td>
-<td>{{job.priority}}</td>
-<td>
+<td data-test-job-type>{{job.type}}</td>
+<td data-test-job-priority>{{job.priority}}</td>
+<td data-test-job-task-groups>
   {{#if job.isReloading}}
     ...
   {{else}}
     {{job.taskGroups.length}}
   {{/if}}
 </td>
-<td>
+<td data-test-job-allocations>
   <div class="inline-chart">{{allocation-status-bar allocationContainer=job isNarrow=true}}</div>
 </td>
diff --git a/ui/app/templates/components/job-version.hbs b/ui/app/templates/components/job-version.hbs
index 6fc55a308..a60b40b70 100644
--- a/ui/app/templates/components/job-version.hbs
+++ b/ui/app/templates/components/job-version.hbs
@@ -1,12 +1,12 @@
 <div class="boxed-section-head is-light inline-definitions">
   Version #{{version.number}}
-  <span class="bumper-left pair is-faded version-stability">
+  <span class="bumper-left pair is-faded">
     <span class="term">Stable</span>
-    <span class="badge is-light is-faded"><code>{{version.stable}}</code></span>
+    <span class="badge is-light is-faded" data-test-version-stability><code>{{version.stable}}</code></span>
   </span>
-  <span class="pair is-faded version-submit-date">
+  <span class="pair is-faded">
     <span class="term">Submitted</span>
-    <span class="submit-date">{{moment-format version.submitTime "MM/DD/YY HH:mm:ss"}}</span>
+    <span data-test-version-submit-date class="submit-date">{{moment-format version.submitTime "MM/DD/YY HH:mm:ss"}}</span>
   </span>
   {{#if version.diff}}
     <button class="button is-light is-compact pull-right" {{action "toggleDiff"}}>{{changeCount}} {{pluralize "Change" changeCount}}</button>
diff --git a/ui/app/templates/components/job-versions-stream.hbs b/ui/app/templates/components/job-versions-stream.hbs
index a9fc61720..30f3dabdc 100644
--- a/ui/app/templates/components/job-versions-stream.hbs
+++ b/ui/app/templates/components/job-versions-stream.hbs
@@ -1,10 +1,10 @@
 {{#each annotatedVersions as |record|}}
   {{#if record.meta.showDate}}
-    <li class="timeline-note">
+    <li data-test-version-time class="timeline-note">
       {{moment-format record.version.submitTime "MMMM D, YYYY"}}
     </li>
   {{/if}}
-  <li class="timeline-object">
+  <li data-test-version class="timeline-object">
     {{job-version version=record.version verbose=verbose}}
   </li>
 {{/each}}
diff --git a/ui/app/templates/components/server-agent-row.hbs b/ui/app/templates/components/server-agent-row.hbs
index 6a5779b3d..e7e926dd6 100644
--- a/ui/app/templates/components/server-agent-row.hbs
+++ b/ui/app/templates/components/server-agent-row.hbs
@@ -1,6 +1,6 @@
-<td>{{#link-to "servers.server" agent.id class="is-primary"}}{{agent.name}}{{/link-to}}</td>
-<td>{{agent.status}}</td>
-<td>{{if agent.isLeader "True" "False"}}</td>
-<td>{{agent.address}}</td>
-<td>{{agent.serfPort}}</td>
-<td>{{agent.datacenter}}</td>
+<td data-test-server-name>{{#link-to "servers.server" agent.id class="is-primary"}}{{agent.name}}{{/link-to}}</td>
+<td data-test-server-status>{{agent.status}}</td>
+<td data-test-server-is-leader>{{if agent.isLeader "True" "False"}}</td>
+<td data-test-server-address>{{agent.address}}</td>
+<td data-test-server-port>{{agent.serfPort}}</td>
+<td data-test-server-datacenter>{{agent.datacenter}}</td>
diff --git a/ui/app/templates/components/task-group-row.hbs b/ui/app/templates/components/task-group-row.hbs
index f37f720b2..4abd42d99 100644
--- a/ui/app/templates/components/task-group-row.hbs
+++ b/ui/app/templates/components/task-group-row.hbs
@@ -1,12 +1,12 @@
-<td>
+<td data-test-task-group-name>
   {{#link-to "jobs.job.task-group" taskGroup.job taskGroup class="is-primary"}}
     {{taskGroup.name}}
   {{/link-to}}
 </td>
-<td>{{taskGroup.count}}</td>
-<td>
+<td data-test-task-group-count>{{taskGroup.count}}</td>
+<td data-test-task-group-allocs>
   <div class="inline-chart">{{allocation-status-bar allocationContainer=taskGroup.summary isNarrow=true}}</div>
 </td>
-<td>{{taskGroup.reservedCPU}} MHz</td>
-<td>{{taskGroup.reservedMemory}} MiB</td>
-<td>{{taskGroup.reservedEphemeralDisk}} MiB</td>
+<td data-test-task-group-cpu>{{taskGroup.reservedCPU}} MHz</td>
+<td data-test-task-group-mem>{{taskGroup.reservedMemory}} MiB</td>
+<td data-test-task-group-disk>{{taskGroup.reservedEphemeralDisk}} MiB</td>
diff --git a/ui/app/templates/jobs/index.hbs b/ui/app/templates/jobs/index.hbs
index 76d63662e..9c8c93888 100644
--- a/ui/app/templates/jobs/index.hbs
+++ b/ui/app/templates/jobs/index.hbs
@@ -10,7 +10,7 @@
     {{else}}
       {{#if filteredJobs.length}}
         <div class="content">
-          <div>{{search-box searchTerm=(mut searchTerm) placeholder="Search jobs..."}}</div>
+          <div>{{search-box data-test-jobs-search searchTerm=(mut searchTerm) placeholder="Search jobs..."}}</div>
         </div>
       {{/if}}
       {{#list-pagination
@@ -31,7 +31,7 @@
             <th class="is-3">Allocation Status</th>
           {{/t.head}}
           {{#t.body key="model.id" as |row|}}
-            {{job-row job=row.model onClick=(action "gotoJob" row.model)}}
+            {{job-row data-test-job-row job=row.model onClick=(action "gotoJob" row.model)}}
           {{/t.body}}
         {{/list-table}}
         <div class="table-foot">
@@ -45,14 +45,14 @@
           </nav>
         </div>
       {{else}}
-        <div class="empty-message">
+        <div data-test-empty-jobs-list class="empty-message">
           {{#if (eq filteredJobs.length 0)}}
-            <h3 class="empty-message-headline">No Jobs</h3>
+            <h3 data-test-empty-jobs-list-headline class="empty-message-headline">No Jobs</h3>
             <p class="empty-message-body">
               The cluster is currently empty.
             </p>
           {{else if searchTerm}}
-            <h3 class="empty-message-headline">No Matches</h3>
+            <h3 data-test-empty-jobs-list-headline class="empty-message-headline">No Matches</h3>
             <p class="empty-message-body">No jobs match the term <strong>{{searchTerm}}</strong></p>
           {{/if}}
         </div>
diff --git a/ui/app/templates/jobs/job/definition.hbs b/ui/app/templates/jobs/job/definition.hbs
index 51cf8345f..d2722fa6a 100644
--- a/ui/app/templates/jobs/job/definition.hbs
+++ b/ui/app/templates/jobs/job/definition.hbs
@@ -10,7 +10,7 @@
   <section class="section">
     <div class="boxed-section">
       <div class="boxed-section-body is-dark">
-        {{json-viewer json=model.definition}}
+        {{json-viewer data-test-definition-view json=model.definition}}
       </div>
     </div>
   </section>
diff --git a/ui/app/templates/jobs/job/index.hbs b/ui/app/templates/jobs/job/index.hbs
index 3366d4ab8..8a0ac1c0d 100644
--- a/ui/app/templates/jobs/job/index.hbs
+++ b/ui/app/templates/jobs/job/index.hbs
@@ -1,7 +1,7 @@
 {{#global-header class="page-header"}}
   {{#each breadcrumbs as |breadcrumb index|}}
     <li class="{{if (eq (inc index) breadcrumbs.length) "is-active"}}">
-      {{#link-to params=breadcrumb.args}}{{breadcrumb.label}}{{/link-to}}
+      {{#link-to data-test-breadcrumb=breadcrumb.label params=breadcrumb.args}}{{breadcrumb.label}}{{/link-to}}
     </li>
   {{/each}}
 {{/global-header}}
@@ -10,7 +10,7 @@
   <section class="section">
     <h1 class="title">
       {{model.name}}
-      <span class="bumper-left tag {{model.statusClass}}">{{model.status}}</span>
+      <span class="bumper-left tag {{model.statusClass}}" data-test-job-status>{{model.status}}</span>
       {{#if model.periodic}}
         <span class="tag is-hollow">periodic</span>
       {{else if model.parameterized}}
@@ -20,10 +20,10 @@
 
     <div class="boxed-section job-stats">
       <div class="boxed-section-body">
-        <span><strong>Type:</strong> {{model.type}} | </span>
-        <span><strong>Priority:</strong> {{model.priority}} </span>
+        <span data-test-job-stat="type"><strong>Type:</strong> {{model.type}} | </span>
+        <span data-test-job-stat="priority"><strong>Priority:</strong> {{model.priority}} </span>
         {{#if (and model.namespace system.shouldShowNamespaces)}}
-          <span> | <strong>Namespace:</strong> {{model.namespace.name}}</span>
+          <span data-test-job-stat="namespace"> | <strong>Namespace:</strong> {{model.namespace.name}}</span>
         {{/if}}
       </div>
     </div>
@@ -34,11 +34,11 @@
       </div>
       <div class="boxed-section-body">
         {{#allocation-status-bar allocationContainer=model class="split-view" as |chart|}}
-          <ol class="legend">
+          <ol data-test-allocations-legend class="legend">
             {{#each chart.data as |datum index|}}
               <li class="{{datum.className}} {{if (eq datum.index chart.activeDatum.index) "is-active"}} {{if (eq datum.value 0) "is-empty"}}">
                 <span class="color-swatch {{if datum.className datum.className (concat "swatch-" index)}}" />
-                <span class="value">{{datum.value}}</span>
+                <span class="value" data-test-legend-value="{{datum.className}}">{{datum.value}}</span>
                 <span class="label">
                   {{datum.label}}
                 </span>
@@ -50,7 +50,7 @@
     </div>
 
     {{#if model.hasPlacementFailures}}
-      <div class="boxed-section is-danger placement-failures">
+      <div class="boxed-section is-danger" data-test-placement-failures>
         <div class="boxed-section-head">
           Placement Failures
         </div>
@@ -58,7 +58,7 @@
           {{#each model.taskGroups as |taskGroup|}}
             {{#if taskGroup.placementFailures}}
               {{#with taskGroup.placementFailures as |failures|}}
-                  <h3 class="title is-5">
+                  <h3 class="title is-5" data-test-placement-failure-task-group>
                     {{taskGroup.name}}
                     <span class="badge is-light">{{inc failures.coalescedFailures}} unplaced</span>
                   </h3>
@@ -101,13 +101,13 @@
     {{/if}}
 
     {{#if model.runningDeployment}}
-      <div class="boxed-section is-info active-deployment">
+      <div class="boxed-section is-info" data-test-active-deployment>
         <div class="boxed-section-head">
           <div class="boxed-section-row">
             Active Deployment
-            <span class="badge is-white is-subtle bumper-left">{{model.runningDeployment.shortId}}</span>
+            <span class="badge is-white is-subtle bumper-left" data-test-active-deployment-stat="id">{{model.runningDeployment.shortId}}</span>
             {{#if model.runningDeployment.version.submitTime}}
-              <span class="pull-right submit-time">{{moment-from-now model.runningDeployment.version.submitTime}}</span>
+              <span class="pull-right submit-time" data-test-active-deployment-stat="submit-time">{{moment-from-now model.runningDeployment.version.submitTime}}</span>
             {{/if}}
           </div>
           <div class="boxed-section-row">
@@ -127,7 +127,7 @@
           {{/job-deployment-details}}
         </div>
         <div class="boxed-section-foot">
-          <a class="pull-right active-deployment-details-toggle" {{action (toggle "isShowingDeploymentDetails" this)}}>
+          <a class="pull-right" {{action (toggle "isShowingDeploymentDetails" this)}} data-test-deployment-toggle-details>
             {{if isShowingDeploymentDetails "Hide" "Show"}} deployment task groups and allocations
           </a>
         </div>
@@ -156,7 +156,7 @@
               {{#t.sort-by prop="reservedEphemeralDisk"}}Reserved Disk{{/t.sort-by}}
             {{/t.head}}
             {{#t.body as |row|}}
-              {{task-group-row taskGroup=row.model onClick=(action "gotoTaskGroup" row.model)}}
+              {{task-group-row data-test-task-group taskGroup=row.model onClick=(action "gotoTaskGroup" row.model)}}
             {{/t.body}}
           {{/list-table}}
         {{/list-pagination}}
@@ -177,12 +177,12 @@
             <th>Placement Failures</th>
           {{/t.head}}
           {{#t.body as |row|}}
-            <tr>
-              <td>{{row.model.shortId}}</td>
-              <td>{{row.model.priority}}</td>
-              <td>{{row.model.triggeredBy}}</td>
-              <td>{{row.model.status}}</td>
-              <td>
+            <tr data-test-evaluation="{{row.model.shortId}}">
+              <td data-test-id>{{row.model.shortId}}</td>
+              <td data-test-priority>{{row.model.priority}}</td>
+              <td data-test-triggered-by>{{row.model.triggeredBy}}</td>
+              <td data-test-status>{{row.model.status}}</td>
+              <td data-test-blocked>
                 {{#if (eq row.model.status "blocked")}}
                   N/A - In Progress
                 {{else if row.model.hasPlacementFailures}}
diff --git a/ui/app/templates/jobs/job/subnav.hbs b/ui/app/templates/jobs/job/subnav.hbs
index 63e712a6c..cfbdeb672 100644
--- a/ui/app/templates/jobs/job/subnav.hbs
+++ b/ui/app/templates/jobs/job/subnav.hbs
@@ -1,10 +1,10 @@
 <div class="tabs is-subnav">
   <ul>
-    <li>{{#link-to "jobs.job.index" job activeClass="is-active"}}Overview{{/link-to}}</li>
-    <li>{{#link-to "jobs.job.definition" job activeClass="is-active"}}Definition{{/link-to}}</li>
-    <li>{{#link-to "jobs.job.versions" job activeClass="is-active"}}Versions{{/link-to}}</li>
+    <li data-test-tab="overview">{{#link-to "jobs.job.index" job activeClass="is-active"}}Overview{{/link-to}}</li>
+    <li data-test-tab="definition">{{#link-to "jobs.job.definition" job activeClass="is-active"}}Definition{{/link-to}}</li>
+    <li data-test-tab="versions">{{#link-to "jobs.job.versions" job activeClass="is-active"}}Versions{{/link-to}}</li>
     {{#if job.supportsDeployments}}
-      <li>{{#link-to "jobs.job.deployments" job activeClass="is-active"}}Deployments{{/link-to}}</li>
+      <li data-test-tab="deployments">{{#link-to "jobs.job.deployments" job activeClass="is-active"}}Deployments{{/link-to}}</li>
     {{/if}}
   </ul>
 </div>
diff --git a/ui/app/templates/jobs/job/task-group.hbs b/ui/app/templates/jobs/job/task-group.hbs
index 679600a1a..90928f830 100644
--- a/ui/app/templates/jobs/job/task-group.hbs
+++ b/ui/app/templates/jobs/job/task-group.hbs
@@ -2,6 +2,7 @@
   {{#each breadcrumbs as |breadcrumb index|}}
     <li class="{{if (eq (inc index) breadcrumbs.length) "is-active"}}">
       {{#link-to
+        data-test-breadcrumb=breadcrumb.label
         params=(append
           breadcrumb.args
           (query-params jobNamespace=(or model.namespace.id "default"))
@@ -26,10 +27,10 @@
       <div class="boxed-section-body inline-definitions">
         <span class="label">Task Group Details</span>
 
-        <span class="pair"><span class="term"># Tasks</span> {{model.tasks.length}}</span>
-        <span class="pair"><span class="term">Reserved CPU</span> {{model.reservedCPU}} MHz</span>
-        <span class="pair"><span class="term">Reserved Memory</span> {{model.reservedMemory}} MiB</span>
-        <span class="pair"><span class="term">Reserved Disk</span> {{model.reservedEphemeralDisk}} MiB</span>
+        <span class="pair" data-test-task-group-tasks><span class="term"># Tasks</span> {{model.tasks.length}}</span>
+        <span class="pair" data-test-task-group-cpu><span class="term">Reserved CPU</span> {{model.reservedCPU}} MHz</span>
+        <span class="pair" data-test-task-group-mem><span class="term">Reserved Memory</span> {{model.reservedMemory}} MiB</span>
+        <span class="pair" data-test-task-group-disk><span class="term">Reserved Disk</span> {{model.reservedEphemeralDisk}} MiB</span>
       </div>
     </div>
 
@@ -85,7 +86,7 @@
               <th>Memory</th>
             {{/t.head}}
             {{#t.body as |row|}}
-              {{allocation-row allocation=row.model context="job" onClick=(action "gotoAllocation" row.model)}}
+              {{allocation-row data-test-allocation allocation=row.model context="job" onClick=(action "gotoAllocation" row.model)}}
             {{/t.body}}
           {{/list-table}}
           <div class="table-foot">
@@ -100,8 +101,8 @@
           </div>
         {{else}}
           <div class="boxed-section-body">
-            <div class="empty-message">
-              <h3 class="empty-message-headline">No Matches</h3>
+            <div class="empty-message" data-test-empty-allocations-list>
+              <h3 class="empty-message-headline" data-test-empty-allocations-list-headline>No Matches</h3>
               <p class="empty-message-body">No allocations match the term <strong>{{searchTerm}}</strong></p>
             </div>
           </div>
diff --git a/ui/app/templates/partials/forbidden-message.hbs b/ui/app/templates/partials/forbidden-message.hbs
index a421e08e9..9fad4e384 100644
--- a/ui/app/templates/partials/forbidden-message.hbs
+++ b/ui/app/templates/partials/forbidden-message.hbs
@@ -1,6 +1,6 @@
-<div class="empty-message">
-  <h3 class="empty-message-headline">Not Authorized</h3>
-  <p class="empty-message-body">
+<div data-test-error class="empty-message">
+  <h3 data-test-error-title class="empty-message-headline">Not Authorized</h3>
+  <p data-test-error-message class="empty-message-body">
     {{#if token.secret}}
       Your {{#link-to "settings.tokens"}}ACL token{{/link-to}} does not provide the required permissions. Contact your administrator if this is an error.
     {{else}}
diff --git a/ui/app/templates/servers.hbs b/ui/app/templates/servers.hbs
index 5b97959ed..6a639191d 100644
--- a/ui/app/templates/servers.hbs
+++ b/ui/app/templates/servers.hbs
@@ -27,7 +27,7 @@
               {{#t.sort-by prop="datacenter"}}Datacenter{{/t.sort-by}}
             {{/t.head}}
             {{#t.body as |row|}}
-              {{server-agent-row agent=row.model}}
+              {{server-agent-row data-test-server-agent-row agent=row.model}}
             {{/t.body}}
           {{/list-table}}
           <div class="table-foot">
diff --git a/ui/app/templates/servers/server.hbs b/ui/app/templates/servers/server.hbs
index 231d704e1..c9ef7a925 100644
--- a/ui/app/templates/servers/server.hbs
+++ b/ui/app/templates/servers/server.hbs
@@ -13,7 +13,7 @@
         </thead>
         <tbody>
           {{#each sortedTags as |tag|}}
-            <tr>
+            <tr data-test-server-tag>
               <td>{{tag.name}}</td>
               <td>{{tag.value}}</td>
             </tr>
diff --git a/ui/app/templates/settings/tokens.hbs b/ui/app/templates/settings/tokens.hbs
index 7f3e75673..e17b84393 100644
--- a/ui/app/templates/settings/tokens.hbs
+++ b/ui/app/templates/settings/tokens.hbs
@@ -20,16 +20,22 @@
         <div class="field">
           <label class="label">Secret ID</label>
           <div class="control">
-            <input class="input token-secret" type="text" placeholder="XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX" value={{token.secret}} oninput={{action (mut secret) value="target.value"}}>
+            <input
+              class="input"
+              type="text"
+              placeholder="XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
+              value={{token.secret}}
+              oninput={{action (mut secret) value="target.value"}}
+              data-test-token-secret>
           </div>
           <p class="help">Sent with every request to determine authorization</p>
         </div>
 
-        <p class="content"><button class="button is-primary token-submit" {{action "verifyToken"}}>Set Token</button></p>
+        <p class="content"><button data-test-token-submit class="button is-primary" {{action "verifyToken"}}>Set Token</button></p>
       {{/if}}
 
       {{#if tokenIsValid}}
-        <div class="notification is-success token-success">
+        <div data-test-token-success class="notification is-success">
           <div class="columns">
             <div class="column">
               <h3 class="title is-4">Token Authenticated!</h3>
@@ -40,7 +46,7 @@
       {{/if}}
 
       {{#if tokenIsInvalid}}
-        <div class="notification is-danger token-error">
+        <div data-test-token-error class="notification is-danger">
           <div class="columns">
             <div class="column">
               <h3 class="title is-4">Token Failed to Authenticate</h3>
@@ -58,26 +64,26 @@
         </div>
         <h3 class="title is-4">Policies</h3>
         {{#if (eq tokenRecord.type "management")}}
-          <div class="boxed-section token-management-message">
+          <div data-test-token-management-message class="boxed-section">
             <div class="boxed-section-body has-centered-text">
               The management token has all permissions
             </div>
           </div>
         {{else}}
           {{#each tokenRecord.policies as |policy|}}
-            <div class="boxed-section token-policy">
-              <div class="boxed-section-head">
+            <div data-test-token-policy class="boxed-section">
+              <div data-test-policy-name class="boxed-section-head">
                 {{policy.name}}
               </div>
               <div class="boxed-section-body">
-                <p class="content">
+                <p data-test-policy-description class="content">
                   {{#if policy.description}}
                     {{policy.description}}
                   {{else}}
                     <em>No description</em>
                   {{/if}}
                 </p>
-                <pre><code>{{policy.rules}}</code></pre>
+                <pre><code data-test-policy-rules>{{policy.rules}}</code></pre>
               </div>
             </div>
           {{/each}}
diff --git a/ui/tests/acceptance/allocation-detail-test.js b/ui/tests/acceptance/allocation-detail-test.js
index f8a7eff95..de651ca10 100644
--- a/ui/tests/acceptance/allocation-detail-test.js
+++ b/ui/tests/acceptance/allocation-detail-test.js
@@ -25,20 +25,23 @@ moduleForAcceptance('Acceptance | allocation detail', {
 test('/allocation/:id should name the allocation and link to the corresponding job and node', function(
   assert
 ) {
-  assert.ok(find('h1').textContent.includes(allocation.name), 'Allocation name is in the heading');
+  assert.ok(
+    find('[data-test-title]').textContent.includes(allocation.name),
+    'Allocation name is in the heading'
+  );
   assert.equal(
-    find('.inline-definitions .job-link a').textContent.trim(),
+    find('[data-test-allocation-details] [data-test-job-link]').textContent.trim(),
     job.name,
     'Job name is in the subheading'
   );
   assert.equal(
-    find('.inline-definitions .node-link a').textContent.trim(),
+    find('[data-test-allocation-details] [data-test-client-link]').textContent.trim(),
     node.id.split('-')[0],
     'Node short id is in the subheading'
   );
 
   andThen(() => {
-    click('.inline-definitions .job-link a');
+    click('[data-test-allocation-details] [data-test-job-link]');
   });
 
   andThen(() => {
@@ -48,7 +51,7 @@ test('/allocation/:id should name the allocation and link to the corresponding j
   visit(`/allocations/${allocation.id}`);
 
   andThen(() => {
-    click('.inline-definitions .node-link a');
+    click('[data-test-allocation-details] [data-test-client-link]');
   });
 
   andThen(() => {
@@ -58,7 +61,7 @@ test('/allocation/:id should name the allocation and link to the corresponding j
 
 test('/allocation/:id should list all tasks for the allocation', function(assert) {
   assert.equal(
-    findAll('.tasks tbody tr').length,
+    findAll('[data-test-task-row]').length,
     server.db.taskStates.where({ allocationId: allocation.id }).length,
     'Table lists all tasks'
   );
@@ -71,13 +74,13 @@ test('each task row should list high-level information for the task', function(a
     .sortBy('name')[0];
   const reservedPorts = taskResources.resources.Networks[0].ReservedPorts;
   const dynamicPorts = taskResources.resources.Networks[0].DynamicPorts;
-  const taskRow = $(findAll('.tasks tbody tr')[0]);
+  const taskRow = $(findAll('[data-test-task-row]')[0]);
   const events = server.db.taskEvents.where({ taskStateId: task.id });
   const event = events[events.length - 1];
 
   assert.equal(
     taskRow
-      .find('td:eq(0)')
+      .find('[data-test-name]')
       .text()
       .trim(),
     task.name,
@@ -85,7 +88,7 @@ test('each task row should list high-level information for the task', function(a
   );
   assert.equal(
     taskRow
-      .find('td:eq(1)')
+      .find('[data-test-state]')
       .text()
       .trim(),
     task.state,
@@ -93,7 +96,7 @@ test('each task row should list high-level information for the task', function(a
   );
   assert.equal(
     taskRow
-      .find('td:eq(2)')
+      .find('[data-test-message]')
       .text()
       .trim(),
     event.message,
@@ -101,7 +104,7 @@ test('each task row should list high-level information for the task', function(a
   );
   assert.equal(
     taskRow
-      .find('td:eq(3)')
+      .find('[data-test-time]')
       .text()
       .trim(),
     moment(event.time / 1000000).format('MM/DD/YY HH:mm:ss'),
@@ -111,7 +114,7 @@ test('each task row should list high-level information for the task', function(a
   assert.ok(reservedPorts.length, 'The task has reserved ports');
   assert.ok(dynamicPorts.length, 'The task has dynamic ports');
 
-  const addressesText = taskRow.find('td:eq(4)').text();
+  const addressesText = taskRow.find('[data-test-ports]').text();
   reservedPorts.forEach(port => {
     assert.ok(addressesText.includes(port.Label), `Found label ${port.Label}`);
     assert.ok(addressesText.includes(port.Value), `Found value ${port.Value}`);
@@ -134,9 +137,9 @@ test('when the allocation is not found, an error message is shown, but the URL p
       'A request to the non-existent allocation is made'
     );
     assert.equal(currentURL(), '/allocations/not-a-real-allocation', 'The URL persists');
-    assert.ok(find('.error-message'), 'Error message is shown');
+    assert.ok(find('[data-test-error]'), 'Error message is shown');
     assert.equal(
-      find('.error-message .title').textContent,
+      find('[data-test-error-title]').textContent,
       'Not Found',
       'Error message is for 404'
     );
diff --git a/ui/tests/acceptance/application-errors-test.js b/ui/tests/acceptance/application-errors-test.js
index b5e2e636e..121e572c6 100644
--- a/ui/tests/acceptance/application-errors-test.js
+++ b/ui/tests/acceptance/application-errors-test.js
@@ -16,13 +16,13 @@ test('transitioning away from an error page resets the global error', function(a
   visit('/clients');
 
   andThen(() => {
-    assert.ok(find('.error-message'), 'Application has errored');
+    assert.ok(find('[data-test-error]'), 'Application has errored');
   });
 
   visit('/jobs');
 
   andThen(() => {
-    assert.notOk(find('.error-message'), 'Application is no longer in an error state');
+    assert.notOk(find('[data-test-error]'), 'Application is no longer in an error state');
   });
 });
 
@@ -34,16 +34,16 @@ test('the 403 error page links to the ACL tokens page', function(assert) {
   visit(`/jobs/${job.id}`);
 
   andThen(() => {
-    assert.ok(find('.error-message'), 'Error message is shown');
+    assert.ok(find('[data-test-error]'), 'Error message is shown');
     assert.equal(
-      find('.error-message .title').textContent,
+      find('[data-test-error] .title').textContent,
       'Not Authorized',
       'Error message is for 403'
     );
   });
 
   andThen(() => {
-    click('.error-message a');
+    click('[data-test-error-acl-link]');
   });
 
   andThen(() => {
diff --git a/ui/tests/acceptance/client-detail-test.js b/ui/tests/acceptance/client-detail-test.js
index 03e28ed6a..1b0788b00 100644
--- a/ui/tests/acceptance/client-detail-test.js
+++ b/ui/tests/acceptance/client-detail-test.js
@@ -24,19 +24,19 @@ test('/clients/:id should have a breadrcumb trail linking back to clients', func
 
   andThen(() => {
     assert.equal(
-      findAll('.breadcrumb a')[0].textContent,
+      find('[data-test-breadcrumb="clients"]').textContent,
       'Clients',
       'First breadcrumb says clients'
     );
     assert.equal(
-      findAll('.breadcrumb a')[1].textContent,
+      find('[data-test-breadcrumb="client"]').textContent,
       node.id.split('-')[0],
       'Second breadcrumb says the node short id'
     );
   });
 
   andThen(() => {
-    click(findAll('.breadcrumb a')[0]);
+    click(find('[data-test-breadcrumb="clients"]'));
   });
 
   andThen(() => {
@@ -48,12 +48,9 @@ test('/clients/:id should list immediate details for the node in the title', fun
   visit(`/clients/${node.id}`);
 
   andThen(() => {
-    assert.ok(find('.title').textContent.includes(node.name), 'Title includes name');
-    assert.ok(find('.title').textContent.includes(node.id), 'Title includes id');
-    assert.ok(
-      findAll(`.title .node-status-light.${node.status}`).length,
-      'Title includes status light'
-    );
+    assert.ok(find('[data-test-title]').textContent.includes(node.name), 'Title includes name');
+    assert.ok(find('[data-test-title]').textContent.includes(node.id), 'Title includes id');
+    assert.ok(find(`[data-test-node-status="${node.status}"]`), 'Title includes status light');
   });
 });
 
@@ -67,16 +64,16 @@ test('/clients/:id should list additional detail for the node below the title',
       'Status is in additional details'
     );
     assert.ok(
-      $('.inline-definitions .pair:eq(0) .status-text').hasClass(`node-${node.status}`),
+      $('[data-test-status-definition] .status-text').hasClass(`node-${node.status}`),
       'Status is decorated with a status class'
     );
     assert.equal(
-      findAll('.inline-definitions .pair')[1].textContent,
+      find('[data-test-address-definition]').textContent,
       `Address ${node.httpAddr}`,
       'Address is in additional detals'
     );
     assert.equal(
-      findAll('.inline-definitions .pair')[2].textContent,
+      find('[data-test-datacenter-definition]').textContent,
       `Datacenter ${node.datacenter}`,
       'Datacenter is in additional details'
     );
@@ -90,7 +87,7 @@ test('/clients/:id should list all allocations on the node', function(assert) {
 
   andThen(() => {
     assert.equal(
-      findAll('.allocations tbody tr').length,
+      findAll('[data-test-allocation]').length,
       allocationsCount,
       `Allocations table lists all ${allocationsCount} associated allocations`
     );
@@ -116,10 +113,10 @@ test('each allocation should have high-level details for the allocation', functi
   visit(`/clients/${node.id}`);
 
   andThen(() => {
-    const allocationRow = $(findAll('.allocations tbody tr')[0]);
+    const allocationRow = $(find('[data-test-allocation]'));
     assert.equal(
       allocationRow
-        .find('td:eq(0)')
+        .find('[data-test-short-id]')
         .text()
         .trim(),
       allocation.id.split('-')[0],
@@ -127,7 +124,7 @@ test('each allocation should have high-level details for the allocation', functi
     );
     assert.equal(
       allocationRow
-        .find('td:eq(1)')
+        .find('[data-test-modify-time]')
         .text()
         .trim(),
       moment(allocation.modifyTime / 1000000).format('MM/DD HH:mm:ss'),
@@ -135,7 +132,7 @@ test('each allocation should have high-level details for the allocation', functi
     );
     assert.equal(
       allocationRow
-        .find('td:eq(2)')
+        .find('[data-test-name]')
         .text()
         .trim(),
       allocation.name,
@@ -143,56 +140,57 @@ test('each allocation should have high-level details for the allocation', functi
     );
     assert.equal(
       allocationRow
-        .find('td:eq(3)')
+        .find('[data-test-client-status]')
         .text()
         .trim(),
       allocation.clientStatus,
       'Client status'
     );
-    assert.ok(
+    assert.equal(
       allocationRow
-        .find('td:eq(4)')
+        .find('[data-test-job]')
         .text()
-        .includes(server.db.jobs.find(allocation.jobId).name),
+        .trim(),
+      server.db.jobs.find(allocation.jobId).name,
       'Job name'
     );
     assert.ok(
       allocationRow
-        .find('td:eq(4) .is-faded')
+        .find('[data-test-task-group]')
         .text()
         .includes(allocation.taskGroup),
       'Task group name'
     );
     assert.ok(
       allocationRow
-        .find('td:eq(5)')
+        .find('[data-test-job-version]')
         .text()
         .includes(allocation.jobVersion),
       'Job Version'
     );
     assert.equal(
       allocationRow
-        .find('td:eq(6)')
+        .find('[data-test-cpu]')
         .text()
         .trim(),
       Math.floor(allocStats.resourceUsage.CpuStats.TotalTicks) / cpuUsed,
       'CPU %'
     );
     assert.equal(
-      allocationRow.find('td:eq(6) .tooltip').attr('aria-label'),
+      allocationRow.find('[data-test-cpu] .tooltip').attr('aria-label'),
       `${Math.floor(allocStats.resourceUsage.CpuStats.TotalTicks)} / ${cpuUsed} MHz`,
       'Detailed CPU information is in a tooltip'
     );
     assert.equal(
       allocationRow
-        .find('td:eq(7)')
+        .find('[data-test-mem]')
         .text()
         .trim(),
       allocStats.resourceUsage.MemoryStats.RSS / 1024 / 1024 / memoryUsed,
       'Memory used'
     );
     assert.equal(
-      allocationRow.find('td:eq(7) .tooltip').attr('aria-label'),
+      allocationRow.find('[data-test-mem] .tooltip').attr('aria-label'),
       `${formatBytes([allocStats.resourceUsage.MemoryStats.RSS])} / ${memoryUsed} MiB`,
       'Detailed memory information is in a tooltip'
     );
@@ -219,7 +217,7 @@ test('each allocation should show job information even if the job is incomplete
   visit(`/clients/${node.id}`);
 
   andThen(() => {
-    const allocationRow = $(findAll('.allocations tbody tr')[0]);
+    const allocationRow = $(find('[data-test-allocation]'));
     const allocation = server.db.allocations
       .where({ nodeId: node.id })
       .sortBy('modifyIndex')
@@ -227,14 +225,14 @@ test('each allocation should show job information even if the job is incomplete
 
     assert.ok(
       allocationRow
-        .find('td:eq(4)')
+        .find('[data-test-job]')
         .text()
         .includes(server.db.jobs.find(allocation.jobId).name),
       'Job name'
     );
     assert.ok(
       allocationRow
-        .find('td:eq(4) .is-faded')
+        .find('[data-test-task-group]')
         .text()
         .includes(allocation.taskGroup),
       'Task group name'
@@ -251,7 +249,7 @@ test('each allocation should link to the allocation detail page', function(asser
   visit(`/clients/${node.id}`);
 
   andThen(() => {
-    click($('.allocations tbody tr:eq(0) td:eq(0) a').get(0));
+    click('[data-test-short-id] a');
   });
 
   andThen(() => {
@@ -270,7 +268,7 @@ test('each allocation should link to the job the allocation belongs to', functio
   const job = server.db.jobs.find(allocation.jobId);
 
   andThen(() => {
-    click($('.allocations tbody tr:eq(0) td:eq(4) a').get(0));
+    click('[data-test-job]');
   });
 
   andThen(() => {
@@ -286,7 +284,7 @@ test('/clients/:id should list all attributes for the node', function(assert) {
   visit(`/clients/${node.id}`);
 
   andThen(() => {
-    assert.ok(find('.attributes-table'), 'Attributes table is on the page');
+    assert.ok(find('[data-test-attributes]'), 'Attributes table is on the page');
   });
 });
 
@@ -302,9 +300,9 @@ test('when the node is not found, an error message is shown, but the URL persist
       'A request to the non-existent node is made'
     );
     assert.equal(currentURL(), '/clients/not-a-real-node', 'The URL persists');
-    assert.ok(find('.error-message'), 'Error message is shown');
+    assert.ok(find('[data-test-error]'), 'Error message is shown');
     assert.equal(
-      find('.error-message .title').textContent,
+      find('[data-test-error-title]').textContent,
       'Not Found',
       'Error message is for 404'
     );
diff --git a/ui/tests/acceptance/job-definition-test.js b/ui/tests/acceptance/job-definition-test.js
index 0317ec93b..5a5478fb8 100644
--- a/ui/tests/acceptance/job-definition-test.js
+++ b/ui/tests/acceptance/job-definition-test.js
@@ -18,7 +18,7 @@ test('visiting /jobs/:job_id/definition', function(assert) {
 });
 
 test('the job definition page contains a json viewer component', function(assert) {
-  assert.ok(findAll('.json-viewer').length, 'JSON viewer found');
+  assert.ok(findAll('[data-test-definition-view]').length, 'JSON viewer found');
 });
 
 test('the job definition page requests the job to display in an unmutated form', function(assert) {
diff --git a/ui/tests/acceptance/job-deployments-test.js b/ui/tests/acceptance/job-deployments-test.js
index 45a6ae426..b2bcfffe4 100644
--- a/ui/tests/acceptance/job-deployments-test.js
+++ b/ui/tests/acceptance/job-deployments-test.js
@@ -33,7 +33,7 @@ test('/jobs/:id/deployments should list all job deployments', function(assert) {
   visit(`/jobs/${job.id}/deployments`);
   andThen(() => {
     assert.ok(
-      findAll('.timeline-object').length,
+      findAll('[data-test-deployment]').length,
       deployments.length,
       'Each deployment gets a row in the timeline'
     );
@@ -51,17 +51,32 @@ test('each deployment mentions the deployment shortId, status, version, and time
       jobId: deployment.jobId,
       version: deployment.versionNumber,
     });
-    const deploymentRow = $(findAll('.timeline-object')[0]);
+    const deploymentRow = $(find('[data-test-deployment]'));
 
     assert.ok(deploymentRow.text().includes(deployment.id.split('-')[0]), 'Short ID');
-    assert.equal(deploymentRow.find('.tag').text(), deployment.status, 'Status');
+    assert.equal(
+      deploymentRow.find('[data-test-deployment-status]').text(),
+      deployment.status,
+      'Status'
+    );
     assert.ok(
-      deploymentRow.find('.tag').hasClass(classForStatus(deployment.status)),
+      deploymentRow
+        .find('[data-test-deployment-status]')
+        .hasClass(classForStatus(deployment.status)),
       'Status Class'
     );
-    assert.ok(deploymentRow.text().includes(deployment.versionNumber), 'Version #');
     assert.ok(
-      deploymentRow.text().includes(moment(version.submitTime / 1000000).fromNow()),
+      deploymentRow
+        .find('[data-test-deployment-version]')
+        .text()
+        .includes(deployment.versionNumber),
+      'Version #'
+    );
+    assert.ok(
+      deploymentRow
+        .find('[data-test-deployment-submit-time]')
+        .text()
+        .includes(moment(version.submitTime / 1000000).fromNow()),
       'Submit time ago'
     );
   });
@@ -90,9 +105,9 @@ test('when the deployment is running and needs promotion, the deployment item sa
   visit(`/jobs/${job.id}/deployments`);
 
   andThen(() => {
-    const deploymentRow = $(findAll('.timeline-object')[0]);
+    const deploymentRow = find('[data-test-deployment]');
     assert.ok(
-      deploymentRow.find('.badge:contains("Requires Promotion")').length,
+      deploymentRow.querySelector('[data-test-promotion-required]'),
       'Requires Promotion badge found'
     );
   });
@@ -104,14 +119,20 @@ test('each deployment item can be opened to show details', function(assert) {
   visit(`/jobs/${job.id}/deployments`);
 
   andThen(() => {
-    deploymentRow = $(findAll('.timeline-object')[0]);
+    deploymentRow = find('[data-test-deployment]');
 
-    assert.ok(deploymentRow.find('.boxed-section-body').length === 0, 'No deployment body');
+    assert.notOk(
+      deploymentRow.querySelector('[data-test-deployment-details]'),
+      'No deployment body'
+    );
 
-    click(deploymentRow.find('button').get(0));
+    click(deploymentRow.querySelector('[data-test-deployment-toggle-details]'));
 
     andThen(() => {
-      assert.ok(deploymentRow.find('.boxed-section-body').length, 'Deployment body found');
+      assert.ok(
+        deploymentRow.querySelector('[data-test-deployment-details]'),
+        'Deployment body found'
+      );
     });
   });
 });
@@ -121,18 +142,16 @@ test('when open, a deployment shows the deployment metrics', function(assert) {
 
   andThen(() => {
     const deployment = sortedDeployments.models[0];
-    const deploymentRow = $(findAll('.timeline-object')[0]);
+    const deploymentRow = find('[data-test-deployment]');
     const taskGroupSummaries = deployment.deploymentTaskGroupSummaryIds.map(id =>
       server.db.deploymentTaskGroupSummaries.find(id)
     );
 
-    click(deploymentRow.find('button').get(0));
+    click(deploymentRow.querySelector('[data-test-deployment-toggle-details]'));
 
     andThen(() => {
       assert.equal(
-        $('.deployment-metrics .label:contains("Canaries") + .value')
-          .get(0)
-          .textContent.trim(),
+        find('[data-test-deployment-metric="canaries"]').textContent.trim(),
         `${sum(taskGroupSummaries, 'placedCanaries')} / ${sum(
           taskGroupSummaries,
           'desiredCanaries'
@@ -141,39 +160,31 @@ test('when open, a deployment shows the deployment metrics', function(assert) {
       );
 
       assert.equal(
-        $('.deployment-metrics .label:contains("Placed") + .value')
-          .get(0)
-          .textContent.trim(),
+        find('[data-test-deployment-metric="placed"]').textContent.trim(),
         sum(taskGroupSummaries, 'placedAllocs'),
         'Placed allocs aggregates across task groups'
       );
 
       assert.equal(
-        $('.deployment-metrics .label:contains("Desired") + .value')
-          .get(0)
-          .textContent.trim(),
+        find('[data-test-deployment-metric="desired"]').textContent.trim(),
         sum(taskGroupSummaries, 'desiredTotal'),
         'Desired allocs aggregates across task groups'
       );
 
       assert.equal(
-        $('.deployment-metrics .label:contains("Healthy") + .value')
-          .get(0)
-          .textContent.trim(),
+        find('[data-test-deployment-metric="healthy"]').textContent.trim(),
         sum(taskGroupSummaries, 'healthyAllocs'),
         'Healthy allocs aggregates across task groups'
       );
 
       assert.equal(
-        $('.deployment-metrics .label:contains("Unhealthy") + .value')
-          .get(0)
-          .textContent.trim(),
+        find('[data-test-deployment-metric="unhealthy"]').textContent.trim(),
         sum(taskGroupSummaries, 'unhealthyAllocs'),
         'Unhealthy allocs aggregates across task groups'
       );
 
       assert.equal(
-        find('.deployment-metrics .notification').textContent.trim(),
+        find('[data-test-deployment-notification]').textContent.trim(),
         deployment.statusDescription,
         'Status description is in the metrics block'
       );
@@ -188,85 +199,65 @@ test('when open, a deployment shows a list of all task groups and their respecti
 
   andThen(() => {
     const deployment = sortedDeployments.models[0];
-    const deploymentRow = $(findAll('.timeline-object')[0]);
+    const deploymentRow = find('[data-test-deployment]');
     const taskGroupSummaries = deployment.deploymentTaskGroupSummaryIds.map(id =>
       server.db.deploymentTaskGroupSummaries.find(id)
     );
 
-    click(deploymentRow.find('button').get(0));
+    click(deploymentRow.querySelector('[data-test-deployment-toggle-details]'));
 
     andThen(() => {
-      assert.ok(
-        deploymentRow.find('.boxed-section-head:contains("Task Groups")').length,
-        'Task groups found'
-      );
+      const taskGroupTable = deploymentRow.querySelector('[data-test-deployment-task-groups]');
 
-      const taskGroupTable = deploymentRow.find(
-        '.boxed-section-head:contains("Task Groups") + .boxed-section-body tbody'
-      );
+      assert.ok(taskGroupTable, 'Task groups found');
 
       assert.equal(
-        taskGroupTable.find('tr').length,
+        taskGroupTable.querySelectorAll('[data-test-deployment-task-group]').length,
         taskGroupSummaries.length,
         'One row per task group'
       );
 
       const taskGroup = taskGroupSummaries[0];
-      const taskGroupRow = taskGroupTable.find('tr:eq(0)');
+      const taskGroupRow = taskGroupTable.querySelector('[data-test-deployment-task-group]');
 
       assert.equal(
-        taskGroupRow
-          .find('td:eq(0)')
-          .text()
-          .trim(),
+        taskGroupRow.querySelector('[data-test-deployment-task-group-name]').textContent.trim(),
         taskGroup.name,
         'Name'
       );
       assert.equal(
         taskGroupRow
-          .find('td:eq(1)')
-          .text()
-          .trim(),
+          .querySelector('[data-test-deployment-task-group-promotion]')
+          .textContent.trim(),
         promotionTestForTaskGroup(taskGroup),
         'Needs Promotion'
       );
       assert.equal(
         taskGroupRow
-          .find('td:eq(2)')
-          .text()
-          .trim(),
+          .querySelector('[data-test-deployment-task-group-auto-revert]')
+          .textContent.trim(),
         taskGroup.autoRevert ? 'Yes' : 'No',
         'Auto Revert'
       );
       assert.equal(
-        taskGroupRow
-          .find('td:eq(3)')
-          .text()
-          .trim(),
+        taskGroupRow.querySelector('[data-test-deployment-task-group-canaries]').textContent.trim(),
         `${taskGroup.placedCanaries} / ${taskGroup.desiredCanaries}`,
         'Canaries'
       );
       assert.equal(
-        taskGroupRow
-          .find('td:eq(4)')
-          .text()
-          .trim(),
+        taskGroupRow.querySelector('[data-test-deployment-task-group-allocs]').textContent.trim(),
         `${taskGroup.placedAllocs} / ${taskGroup.desiredTotal}`,
         'Allocs'
       );
       assert.equal(
-        taskGroupRow
-          .find('td:eq(5)')
-          .text()
-          .trim(),
+        taskGroupRow.querySelector('[data-test-deployment-task-group-healthy]').textContent.trim(),
         taskGroup.healthyAllocs,
         'Healthy Allocs'
       );
       assert.equal(
         taskGroupRow
-          .find('td:eq(6)')
-          .text()
-          .trim(),
+          .querySelector('[data-test-deployment-task-group-unhealthy]')
+          .textContent.trim(),
         taskGroup.unhealthyAllocs,
         'Unhealthy Allocs'
       );
@@ -281,38 +272,31 @@ test('when open, a deployment shows a list of all allocations for the deployment
 
   andThen(() => {
     const deployment = sortedDeployments.models[0];
-    const deploymentRow = $(findAll('.timeline-object')[0]);
+    const deploymentRow = find('[data-test-deployment]');
 
     // TODO: Make this less brittle. This logic is copied from the mirage config,
     // since there is no reference to allocations on the deployment model.
     const allocations = server.db.allocations.where({ jobId: deployment.jobId }).slice(0, 3);
 
-    click(deploymentRow.find('button').get(0));
+    click(deploymentRow.querySelector('[data-test-deployment-toggle-details]'));
 
     andThen(() => {
       assert.ok(
-        deploymentRow.find('.boxed-section-head:contains("Allocations")').length,
+        deploymentRow.querySelector('[data-test-deployment-allocations]'),
         'Allocations found'
       );
 
-      const allocationsTable = deploymentRow.find(
-        '.boxed-section-head:contains("Allocations") + .boxed-section-body tbody'
-      );
-
       assert.equal(
-        allocationsTable.find('tr').length,
+        deploymentRow.querySelectorAll('[data-test-deployment-allocation]').length,
         allocations.length,
         'One row per allocation'
       );
 
       const allocation = allocations[0];
-      const allocationRow = allocationsTable.find('tr:eq(0)');
+      const allocationRow = deploymentRow.querySelector('[data-test-deployment-allocation]');
 
       assert.equal(
-        allocationRow
-          .find('td:eq(0)')
-          .text()
-          .trim(),
+        allocationRow.querySelector('[data-test-short-id]').textContent.trim(),
         allocation.id.split('-')[0],
         'Allocation is as expected'
       );
diff --git a/ui/tests/acceptance/job-detail-test.js b/ui/tests/acceptance/job-detail-test.js
index 758e40c91..a1df252ec 100644
--- a/ui/tests/acceptance/job-detail-test.js
+++ b/ui/tests/acceptance/job-detail-test.js
@@ -1,5 +1,4 @@
 import { get } from '@ember/object';
-import $ from 'jquery';
 import { click, findAll, currentURL, find, visit } from 'ember-native-dom-helpers';
 import moment from 'moment';
 import { test } from 'qunit';
@@ -22,14 +21,18 @@ test('visiting /jobs/:job_id', function(assert) {
 });
 
 test('breadcrumbs includes job name and link back to the jobs list', function(assert) {
-  assert.equal(findAll('.breadcrumb a')[0].textContent, 'Jobs', 'First breadcrumb says jobs');
   assert.equal(
-    findAll('.breadcrumb a')[1].textContent,
+    find('[data-test-breadcrumb="Jobs"]').textContent,
+    'Jobs',
+    'First breadcrumb says jobs'
+  );
+  assert.equal(
+    find(`[data-test-breadcrumb="${job.name}"]`).textContent,
     job.name,
     'Second breadcrumb says the job name'
   );
 
-  click(findAll('.breadcrumb a')[0]);
+  click(find('[data-test-breadcrumb="Jobs"]'));
   andThen(() => {
     assert.equal(currentURL(), '/jobs', 'First breadcrumb links back to jobs');
   });
@@ -38,7 +41,7 @@ test('breadcrumbs includes job name and link back to the jobs list', function(as
 test('the subnav includes links to definition, versions, and deployments when type = service', function(
   assert
 ) {
-  const subnavLabels = findAll('.tabs.is-subnav a').map(anchor => anchor.textContent);
+  const subnavLabels = findAll('[data-test-tab]').map(anchor => anchor.textContent);
   assert.ok(subnavLabels.some(label => label === 'Definition'), 'Definition link');
   assert.ok(subnavLabels.some(label => label === 'Versions'), 'Versions link');
   assert.ok(subnavLabels.some(label => label === 'Deployments'), 'Deployments link');
@@ -49,7 +52,7 @@ test('the subnav includes links to definition and versions when type != service'
   visit(`/jobs/${job.id}`);
 
   andThen(() => {
-    const subnavLabels = findAll('.tabs.is-subnav a').map(anchor => anchor.textContent);
+    const subnavLabels = findAll('[data-test-tab]').map(anchor => anchor.textContent);
     assert.ok(subnavLabels.some(label => label === 'Definition'), 'Definition link');
     assert.ok(subnavLabels.some(label => label === 'Versions'), 'Versions link');
     assert.notOk(subnavLabels.some(label => label === 'Deployments'), 'Deployments link');
@@ -57,15 +60,15 @@ test('the subnav includes links to definition and versions when type != service'
 });
 
 test('the job detail page should contain basic information about the job', function(assert) {
-  assert.ok(findAll('.title .tag')[0].textContent.includes(job.status), 'Status');
-  assert.ok(findAll('.job-stats span')[0].textContent.includes(job.type), 'Type');
-  assert.ok(findAll('.job-stats span')[1].textContent.includes(job.priority), 'Priority');
-  assert.notOk(findAll('.job-stats span')[2], 'Namespace is not included');
+  assert.ok(find('[data-test-job-status]').textContent.includes(job.status), 'Status');
+  assert.ok(find('[data-test-job-stat="type"]').textContent.includes(job.type), 'Type');
+  assert.ok(find('[data-test-job-stat="priority"]').textContent.includes(job.priority), 'Priority');
+  assert.notOk(find('[data-test-job-stat="namespace"]'), 'Namespace is not included');
 });
 
 test('the job detail page should list all task groups', function(assert) {
   assert.equal(
-    findAll('.task-group-row').length,
+    findAll('[data-test-task-group]').length,
     server.db.taskGroups.where({ jobId: job.id }).length
   );
 });
@@ -74,45 +77,38 @@ test('each row in the task group table should show basic information about the t
   assert
 ) {
   const taskGroup = job.taskGroupIds.map(id => server.db.taskGroups.find(id)).sortBy('name')[0];
-  const taskGroupRow = $(findAll('.task-group-row')[0]);
+  const taskGroupRow = find('[data-test-task-group]');
   const tasks = server.db.tasks.where({ taskGroupId: taskGroup.id });
   const sum = (list, key) => list.reduce((sum, item) => sum + get(item, key), 0);
 
   assert.equal(
-    taskGroupRow
-      .find('td:eq(0)')
-      .text()
-      .trim(),
+    taskGroupRow.querySelector('[data-test-task-group-name]').textContent.trim(),
     taskGroup.name,
     'Name'
   );
   assert.equal(
-    taskGroupRow
-      .find('td:eq(1)')
-      .text()
-      .trim(),
+    taskGroupRow.querySelector('[data-test-task-group-count]').textContent.trim(),
     taskGroup.count,
     'Count'
   );
   assert.equal(
-    taskGroupRow.find('td:eq(3)').text(),
+    taskGroupRow.querySelector('[data-test-task-group-cpu]').textContent.trim(),
     `${sum(tasks, 'Resources.CPU')} MHz`,
     'Reserved CPU'
   );
   assert.equal(
-    taskGroupRow.find('td:eq(4)').text(),
+    taskGroupRow.querySelector('[data-test-task-group-mem]').textContent.trim(),
     `${sum(tasks, 'Resources.MemoryMB')} MiB`,
     'Reserved Memory'
   );
   assert.equal(
-    taskGroupRow.find('td:eq(5)').text(),
+    taskGroupRow.querySelector('[data-test-task-group-disk]').textContent.trim(),
     `${taskGroup.ephemeralDisk.SizeMB} MiB`,
     'Reserved Disk'
   );
 });
 
 test('the allocations diagram lists all allocation status figures', function(assert) {
-  const legend = find('.distribution-bar .legend');
   const jobSummary = server.db.jobSummaries.findBy({ jobId: job.id });
   const statusCounts = Object.keys(jobSummary.Summary).reduce(
     (counts, key) => {
@@ -129,37 +125,37 @@ test('the allocations diagram lists all allocation status figures', function(ass
   );
 
   assert.equal(
-    legend.querySelector('li.queued .value').textContent,
+    find('[data-test-legend-value="queued"]').textContent,
     statusCounts.queued,
     `${statusCounts.queued} are queued`
   );
 
   assert.equal(
-    legend.querySelector('li.starting .value').textContent,
+    find('[data-test-legend-value="starting"]').textContent,
     statusCounts.starting,
     `${statusCounts.starting} are starting`
   );
 
   assert.equal(
-    legend.querySelector('li.running .value').textContent,
+    find('[data-test-legend-value="running"]').textContent,
     statusCounts.running,
     `${statusCounts.running} are running`
   );
 
   assert.equal(
-    legend.querySelector('li.complete .value').textContent,
+    find('[data-test-legend-value="complete"]').textContent,
     statusCounts.complete,
     `${statusCounts.complete} are complete`
   );
 
   assert.equal(
-    legend.querySelector('li.failed .value').textContent,
+    find('[data-test-legend-value="failed"]').textContent,
     statusCounts.failed,
     `${statusCounts.failed} are failed`
   );
 
   assert.equal(
-    legend.querySelector('li.lost .value').textContent,
+    find('[data-test-legend-value="lost"]').textContent,
     statusCounts.lost,
     `${statusCounts.lost} are lost`
   );
@@ -174,7 +170,7 @@ test('there is no active deployment section when the job has no active deploymen
   visit(`/jobs/${job.id}`);
 
   andThen(() => {
-    assert.ok(findAll('.active-deployment').length === 0, 'No active deployment');
+    assert.notOk(find('[data-test-active-deployment]'), 'No active deployment');
   });
 });
 
@@ -193,27 +189,21 @@ test('the active deployment section shows up for the currently running deploymen
   visit(`/jobs/${job.id}`);
 
   andThen(() => {
-    assert.ok(findAll('.active-deployment').length === 1, 'Active deployment');
+    assert.ok(find('[data-test-active-deployment]'), 'Active deployment');
     assert.equal(
-      $('.active-deployment > .boxed-section-head .badge')
-        .get(0)
-        .textContent.trim(),
+      find('[data-test-active-deployment-stat="id"]').textContent.trim(),
       deployment.id.split('-')[0],
       'The active deployment is the most recent running deployment'
     );
 
     assert.equal(
-      $('.active-deployment > .boxed-section-head .submit-time')
-        .get(0)
-        .textContent.trim(),
+      find('[data-test-active-deployment-stat="submit-time"]').textContent.trim(),
       moment(version.submitTime / 1000000).fromNow(),
       'Time since the job was submitted is in the active deployment header'
     );
 
     assert.equal(
-      $('.deployment-metrics .label:contains("Canaries") + .value')
-        .get(0)
-        .textContent.trim(),
+      find('[data-test-deployment-metric="canaries"]').textContent.trim(),
       `${sum(taskGroupSummaries, 'placedCanaries')} / ${sum(
         taskGroupSummaries,
         'desiredCanaries'
@@ -222,41 +212,31 @@ test('the active deployment section shows up for the currently running deploymen
     );
 
     assert.equal(
-      $('.deployment-metrics .label:contains("Placed") + .value')
-        .get(0)
-        .textContent.trim(),
+      find('[data-test-deployment-metric="placed"]').textContent.trim(),
       sum(taskGroupSummaries, 'placedAllocs'),
       'Placed allocs aggregates across task groups'
     );
 
     assert.equal(
-      $('.deployment-metrics .label:contains("Desired") + .value')
-        .get(0)
-        .textContent.trim(),
+      find('[data-test-deployment-metric="desired"]').textContent.trim(),
       sum(taskGroupSummaries, 'desiredTotal'),
       'Desired allocs aggregates across task groups'
     );
 
     assert.equal(
-      $('.deployment-metrics .label:contains("Healthy") + .value')
-        .get(0)
-        .textContent.trim(),
+      find('[data-test-deployment-metric="healthy"]').textContent.trim(),
       sum(taskGroupSummaries, 'healthyAllocs'),
       'Healthy allocs aggregates across task groups'
     );
 
     assert.equal(
-      $('.deployment-metrics .label:contains("Unhealthy") + .value')
-        .get(0)
-        .textContent.trim(),
+      find('[data-test-deployment-metric="unhealthy"]').textContent.trim(),
       sum(taskGroupSummaries, 'unhealthyAllocs'),
       'Unhealthy allocs aggregates across task groups'
     );
 
     assert.equal(
-      $('.deployment-metrics .notification')
-        .get(0)
-        .textContent.trim(),
+      find('[data-test-deployment-notification]').textContent.trim(),
       deployment.statusDescription,
       'Status description is in the metrics block'
     );
@@ -270,29 +250,17 @@ test('the active deployment section can be expanded to show task groups and allo
   visit(`/jobs/${job.id}`);
 
   andThen(() => {
-    assert.ok(
-      $('.active-deployment .boxed-section-head:contains("Task Groups")').length === 0,
-      'Task groups not found'
-    );
-    assert.ok(
-      $('.active-deployment .boxed-section-head:contains("Allocations")').length === 0,
-      'Allocations not found'
-    );
+    assert.notOk(find('[data-test-deployment-task-groups]'), 'Task groups not found');
+    assert.notOk(find('[data-test-deployment-allocations]'), 'Allocations not found');
   });
 
   andThen(() => {
-    click('.active-deployment-details-toggle');
+    click('[data-test-deployment-toggle-details]');
   });
 
   andThen(() => {
-    assert.ok(
-      $('.active-deployment .boxed-section-head:contains("Task Groups")').length === 1,
-      'Task groups found'
-    );
-    assert.ok(
-      $('.active-deployment .boxed-section-head:contains("Allocations")').length === 1,
-      'Allocations found'
-    );
+    assert.ok(find('[data-test-deployment-task-groups]'), 'Task groups found');
+    assert.ok(find('[data-test-deployment-allocations]'), 'Allocations found');
   });
 });
 
@@ -307,25 +275,37 @@ test('the evaluations table lists evaluations sorted by modify index', function(
 
   andThen(() => {
     assert.equal(
-      findAll('.evaluations tbody tr').length,
+      findAll('[data-test-evaluation]').length,
       evaluations.length,
       'A row for each evaluation'
     );
 
     evaluations.forEach((evaluation, index) => {
-      const row = $(findAll('.evaluations tbody tr')[index]);
+      const row = findAll('[data-test-evaluation]')[index];
       assert.equal(
-        row.find('td:eq(0)').text(),
+        row.querySelector('[data-test-id]').textContent,
         evaluation.id.split('-')[0],
         `Short ID, row ${index}`
       );
     });
 
     const firstEvaluation = evaluations[0];
-    const row = $(findAll('.evaluations tbody tr')[0]);
-    assert.equal(row.find('td:eq(1)').text(), '' + firstEvaluation.priority, 'Priority');
-    assert.equal(row.find('td:eq(2)').text(), firstEvaluation.triggeredBy, 'Triggered By');
-    assert.equal(row.find('td:eq(3)').text(), firstEvaluation.status, 'Status');
+    const row = find('[data-test-evaluation]');
+    assert.equal(
+      row.querySelector('[data-test-priority]').textContent,
+      '' + firstEvaluation.priority,
+      'Priority'
+    );
+    assert.equal(
+      row.querySelector('[data-test-triggered-by]').textContent,
+      firstEvaluation.triggeredBy,
+      'Triggered By'
+    );
+    assert.equal(
+      row.querySelector('[data-test-status]').textContent,
+      firstEvaluation.status,
+      'Status'
+    );
   });
 });
 
@@ -342,9 +322,9 @@ test('when the job has placement failures, they are called out', function(assert
   visit(`/jobs/${job.id}`);
 
   andThen(() => {
-    assert.ok(find('.placement-failures'), 'Placement failures section found');
+    assert.ok(find('[data-test-placement-failures]'), 'Placement failures section found');
 
-    const taskGroupLabels = findAll('.placement-failures h3.title').map(title =>
+    const taskGroupLabels = findAll('[data-test-placement-failure-task-group]').map(title =>
       title.textContent.trim()
     );
     failedTaskGroupNames.forEach(name => {
@@ -369,7 +349,7 @@ test('when the job has no placement failures, the placement failures section is
   visit(`/jobs/${job.id}`);
 
   andThen(() => {
-    assert.notOk(find('.placement-failures'), 'Placement failures section not found');
+    assert.notOk(find('[data-test-placement-failures]'), 'Placement failures section not found');
   });
 });
 
@@ -385,9 +365,9 @@ test('when the job is not found, an error message is shown, but the URL persists
       'A request to the non-existent job is made'
     );
     assert.equal(currentURL(), '/jobs/not-a-real-job', 'The URL persists');
-    assert.ok(find('.error-message'), 'Error message is shown');
+    assert.ok(find('[data-test-error]'), 'Error message is shown');
     assert.equal(
-      find('.error-message .title').textContent,
+      find('[data-test-error-title]').textContent,
       'Not Found',
       'Error message is for 404'
     );
@@ -411,7 +391,7 @@ test('when there are namespaces, the job detail page states the namespace for th
 
   andThen(() => {
     assert.ok(
-      findAll('.job-stats span')[2].textContent.includes(namespace.name),
+      find('[data-test-job-stat="namespace"]').textContent.includes(namespace.name),
       'Namespace included in stats'
     );
   });
@@ -427,7 +407,7 @@ test('when switching namespaces, the app redirects to /jobs with the new namespa
   visit(`/jobs/${job.id}?namespace=${namespace.name}`);
 
   andThen(() => {
-    selectChoose('.namespace-switcher', label);
+    selectChoose('[data-test-namespace-switcher]', label);
   });
 
   andThen(() => {
@@ -436,13 +416,15 @@ test('when switching namespaces, the app redirects to /jobs with the new namespa
       .where({ namespace: otherNamespace })
       .sortBy('modifyIndex')
       .reverse();
-    assert.equal(findAll('.job-row').length, jobs.length, 'Shows the right number of jobs');
+    assert.equal(
+      findAll('[data-test-job-row]').length,
+      jobs.length,
+      'Shows the right number of jobs'
+    );
     jobs.forEach((job, index) => {
+      const jobRow = findAll('[data-test-job-row]')[index];
       assert.equal(
-        $(findAll('.job-row')[index])
-          .find('td:eq(0)')
-          .text()
-          .trim(),
+        jobRow.querySelector('[data-test-job-name]').textContent.trim(),
         job.name,
         `Job ${index} is right`
       );
diff --git a/ui/tests/acceptance/job-versions-test.js b/ui/tests/acceptance/job-versions-test.js
index 4d8b161ce..8a20f366b 100644
--- a/ui/tests/acceptance/job-versions-test.js
+++ b/ui/tests/acceptance/job-versions-test.js
@@ -1,5 +1,4 @@
-import $ from 'jquery';
-import { findAll, visit } from 'ember-native-dom-helpers';
+import { find, findAll, visit } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
 import moment from 'moment';
@@ -18,7 +17,7 @@ moduleForAcceptance('Acceptance | job versions', {
 
 test('/jobs/:id/versions should list all job versions', function(assert) {
   assert.ok(
-    findAll('.timeline-object').length,
+    findAll('[data-test-version]').length,
     versions.length,
     'Each version gets a row in the timeline'
   );
@@ -28,16 +27,16 @@ test('each version mentions the version number, the stability, and the submitted
   assert
 ) {
   const version = versions.sortBy('submitTime').reverse()[0];
-  const versionRow = $(findAll('.timeline-object')[0]);
+  const versionRow = find('[data-test-version]');
 
-  assert.ok(versionRow.text().includes(`Version #${version.version}`), 'Version #');
+  assert.ok(versionRow.textContent.includes(`Version #${version.version}`), 'Version #');
   assert.equal(
-    versionRow.find('.version-stability .badge').text(),
+    versionRow.querySelector('[data-test-version-stability]').textContent,
     version.stable.toString(),
     'Stability'
   );
   assert.equal(
-    versionRow.find('.version-submit-date .submit-date').text(),
+    versionRow.querySelector('[data-test-version-submit-date]').textContent,
     moment(version.submitTime / 1000000).format('MM/DD/YY HH:mm:ss'),
     'Submit time'
   );
diff --git a/ui/tests/acceptance/jobs-list-test.js b/ui/tests/acceptance/jobs-list-test.js
index 4de2869ea..d7f870214 100644
--- a/ui/tests/acceptance/jobs-list-test.js
+++ b/ui/tests/acceptance/jobs-list-test.js
@@ -1,4 +1,3 @@
-import $ from 'jquery';
 import { click, find, findAll, currentURL, visit, fillIn } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
@@ -27,10 +26,11 @@ test('/jobs should list the first page of jobs sorted by modify index', function
 
   andThen(() => {
     const sortedJobs = server.db.jobs.sortBy('modifyIndex').reverse();
-    assert.equal(findAll('.job-row').length, pageSize);
+    assert.equal(findAll('[data-test-job-row]').length, pageSize);
     for (var jobNumber = 0; jobNumber < pageSize; jobNumber++) {
+      const jobRow = findAll('[data-test-job-row]')[jobNumber];
       assert.equal(
-        $(`.job-row:eq(${jobNumber}) td:eq(0)`).text(),
+        jobRow.querySelector('[data-test-job-name]').textContent,
         sortedJobs[jobNumber].name,
         'Jobs are ordered'
       );
@@ -46,26 +46,28 @@ test('each job row should contain information about the job', function(assert) {
   visit('/jobs');
 
   andThen(() => {
-    const jobRow = $(findAll('.job-row')[0]);
+    const jobRow = find('[data-test-job-row]');
 
-    assert.equal(jobRow.find('td:eq(0)').text(), job.name, 'Name');
-    assert.equal(jobRow.find('td:eq(0) a').attr('href'), `/ui/jobs/${job.id}`, 'Detail Link');
+    assert.equal(jobRow.querySelector('[data-test-job-name]').textContent, job.name, 'Name');
     assert.equal(
-      jobRow
-        .find('td:eq(1)')
-        .text()
-        .trim(),
+      jobRow.querySelector('[data-test-job-name] a').getAttribute('href'),
+      `/ui/jobs/${job.id}`,
+      'Detail Link'
+    );
+    assert.equal(
+      jobRow.querySelector('[data-test-job-status]').textContent.trim(),
       job.status,
       'Status'
     );
-    assert.equal(jobRow.find('td:eq(2)').text(), job.type, 'Type');
-    assert.equal(jobRow.find('td:eq(3)').text(), job.priority, 'Priority');
+    assert.equal(jobRow.querySelector('[data-test-job-type]').textContent, job.type, 'Type');
+    assert.equal(
+      jobRow.querySelector('[data-test-job-priority]').textContent,
+      job.priority,
+      'Priority'
+    );
     andThen(() => {
       assert.equal(
-        jobRow
-          .find('td:eq(4)')
-          .text()
-          .trim(),
+        jobRow.querySelector('[data-test-job-task-groups]').textContent.trim(),
         taskGroups.length,
         '# Groups'
       );
@@ -80,7 +82,7 @@ test('each job row should link to the corresponding job', function(assert) {
   visit('/jobs');
 
   andThen(() => {
-    click($('.job-row:eq(0) td:eq(0) a').get(0));
+    click('[data-test-job-name] a');
   });
 
   andThen(() => {
@@ -92,8 +94,8 @@ test('when there are no jobs, there is an empty message', function(assert) {
   visit('/jobs');
 
   andThen(() => {
-    assert.ok(find('.empty-message'));
-    assert.equal(find('.empty-message-headline').textContent, 'No Jobs');
+    assert.ok(find('[data-test-empty-jobs-list]'));
+    assert.equal(find('[data-test-empty-jobs-list-headline]').textContent, 'No Jobs');
   });
 });
 
@@ -106,12 +108,12 @@ test('when there are jobs, but no matches for a search result, there is an empty
   visit('/jobs');
 
   andThen(() => {
-    fillIn('.search-box input', 'dog');
+    fillIn('[data-test-jobs-search] input', 'dog');
   });
 
   andThen(() => {
-    assert.ok(find('.empty-message'));
-    assert.equal(find('.empty-message-headline').textContent, 'No Matches');
+    assert.ok(find('[data-test-empty-jobs-list]'));
+    assert.equal(find('[data-test-empty-jobs-list-headline]').textContent, 'No Matches');
   });
 });
 
@@ -125,16 +127,20 @@ test('when the namespace query param is set, only matching jobs are shown and th
   visit('/jobs');
 
   andThen(() => {
-    assert.equal(findAll('.job-row').length, 1, 'One job in the default namespace');
-    assert.equal(find('.job-row td').textContent, job1.name, 'The correct job is shown');
+    assert.equal(findAll('[data-test-job-row]').length, 1, 'One job in the default namespace');
+    assert.equal(find('[data-test-job-name]').textContent, job1.name, 'The correct job is shown');
   });
 
   const secondNamespace = server.db.namespaces[1];
   visit(`/jobs?namespace=${secondNamespace.id}`);
 
   andThen(() => {
-    assert.equal(findAll('.job-row').length, 1, `One job in the ${secondNamespace.name} namespace`);
-    assert.equal(find('.job-row td').textContent, job2.name, 'The correct job is shown');
+    assert.equal(
+      findAll('[data-test-job-row]').length,
+      1,
+      `One job in the ${secondNamespace.name} namespace`
+    );
+    assert.equal(find('[data-test-job-name]').textContent, job2.name, 'The correct job is shown');
   });
 });
 
@@ -146,11 +152,11 @@ test('when accessing jobs is forbidden, show a message with a link to the tokens
   visit('/jobs');
 
   andThen(() => {
-    assert.equal(find('.empty-message-headline').textContent, 'Not Authorized');
+    assert.equal(find('[data-test-error-title]').textContent, 'Not Authorized');
   });
 
   andThen(() => {
-    click('.empty-message-body a');
+    click('[data-test-error-message] a');
   });
 
   andThen(() => {
diff --git a/ui/tests/acceptance/namespaces-test.js b/ui/tests/acceptance/namespaces-test.js
index 12b0df203..9237fed75 100644
--- a/ui/tests/acceptance/namespaces-test.js
+++ b/ui/tests/acceptance/namespaces-test.js
@@ -42,11 +42,11 @@ test('the namespace switcher lists all namespaces', function(assert) {
   visit('/jobs');
 
   andThen(() => {
-    assert.ok(find('.gutter .menu .namespace-switcher'), 'Namespace switcher found');
+    assert.ok(find('[data-test-namespace-switcher]'), 'Namespace switcher found');
   });
 
   andThen(() => {
-    click('.gutter .menu .namespace-switcher .ember-power-select-trigger');
+    click('[data-test-namespace-switcher] .ember-power-select-trigger');
   });
 
   andThen(() => {
@@ -81,7 +81,7 @@ test('changing the namespace sets the namespace in localStorage', function(asser
 
   visit('/jobs');
 
-  selectChoose('.namespace-switcher', namespace.name);
+  selectChoose('[data-test-namespace-switcher]', namespace.name);
   andThen(() => {
     assert.equal(
       window.localStorage.nomadActiveNamespace,
@@ -106,7 +106,7 @@ test('changing the namespace refreshes the jobs list when on the jobs page', fun
     );
   });
 
-  selectChoose('.namespace-switcher', namespace.name);
+  selectChoose('[data-test-namespace-switcher]', namespace.name);
 
   andThen(() => {
     const requests = server.pretender.handledRequests.filter(req => req.url.startsWith('/v1/jobs'));
diff --git a/ui/tests/acceptance/nodes-list-test.js b/ui/tests/acceptance/nodes-list-test.js
index cc0ab00bc..dde20b744 100644
--- a/ui/tests/acceptance/nodes-list-test.js
+++ b/ui/tests/acceptance/nodes-list-test.js
@@ -1,4 +1,3 @@
-import $ from 'jquery';
 import { click, find, findAll, currentURL, visit } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
@@ -23,14 +22,15 @@ test('/clients should list one page of clients', function(assert) {
   visit('/clients');
 
   andThen(() => {
-    assert.equal(findAll('.client-node-row').length, pageSize);
-    assert.ok(findAll('.pagination').length, 'Pagination found on the page');
+    assert.equal(findAll('[data-test-client-node-row]').length, pageSize);
+    assert.ok(find('[data-test-pagination]'), 'Pagination found on the page');
 
     const sortedNodes = server.db.nodes.sortBy('modifyIndex').reverse();
 
     for (var nodeNumber = 0; nodeNumber < pageSize; nodeNumber++) {
+      const nodeRow = findAll('[data-test-client-node-row]')[nodeNumber];
       assert.equal(
-        $(`.client-node-row:eq(${nodeNumber}) td:eq(0)`).text(),
+        nodeRow.querySelector('[data-test-client-id]').textContent.trim(),
         sortedNodes[nodeNumber].id.split('-')[0],
         'Clients are ordered'
       );
@@ -45,17 +45,41 @@ test('each client record should show high-level info of the client', function(as
   visit('/clients');
 
   andThen(() => {
-    const nodeRow = $(findAll('.client-node-row')[0]);
+    const nodeRow = find('[data-test-client-node-row]');
     const allocations = server.db.allocations.where({ nodeId: node.id });
     const { address, port } = ipParts(node.httpAddr);
 
-    assert.equal(nodeRow.find('td:eq(0)').text(), node.id.split('-')[0], 'ID');
-    assert.equal(nodeRow.find('td:eq(1)').text(), node.name, 'Name');
-    assert.equal(nodeRow.find('td:eq(2)').text(), node.status, 'Status');
-    assert.equal(nodeRow.find('td:eq(3)').text(), address, 'Address');
-    assert.equal(nodeRow.find('td:eq(4)').text(), port, 'Port');
-    assert.equal(nodeRow.find('td:eq(5)').text(), node.datacenter, 'Datacenter');
-    assert.equal(nodeRow.find('td:eq(6)').text(), allocations.length, '# Allocations');
+    assert.equal(
+      nodeRow.querySelector('[data-test-client-id]').textContent.trim(),
+      node.id.split('-')[0],
+      'ID'
+    );
+    assert.equal(
+      nodeRow.querySelector('[data-test-client-name]').textContent.trim(),
+      node.name,
+      'Name'
+    );
+    assert.equal(
+      nodeRow.querySelector('[data-test-client-status]').textContent.trim(),
+      node.status,
+      'Status'
+    );
+    assert.equal(
+      nodeRow.querySelector('[data-test-client-address]').textContent.trim(),
+      address,
+      'Address'
+    );
+    assert.equal(nodeRow.querySelector('[data-test-client-port]').textContent.trim(), port, 'Port');
+    assert.equal(
+      nodeRow.querySelector('[data-test-client-datacenter]').textContent.trim(),
+      node.datacenter,
+      'Datacenter'
+    );
+    assert.equal(
+      nodeRow.querySelector('[data-test-client-allocations]').textContent.trim(),
+      allocations.length,
+      '# Allocations'
+    );
   });
 });
 
@@ -65,7 +89,7 @@ test('each client should link to the client detail page', function(assert) {
 
   visit('/clients');
   andThen(() => {
-    click(findAll('.client-node-row')[0]);
+    click('[data-test-client-node-row]');
   });
 
   andThen(() => {
@@ -79,8 +103,8 @@ test('when there are no clients, there is an empty message', function(assert) {
   visit('/clients');
 
   andThen(() => {
-    assert.ok(find('.empty-message'));
-    assert.equal(find('.empty-message-headline').textContent, 'No Clients');
+    assert.ok(find('[data-test-empty-clients-list]'));
+    assert.equal(find('[data-test-empty-clients-list-headline]').textContent, 'No Clients');
   });
 });
 
@@ -97,8 +121,8 @@ test('when there are clients, but no matches for a search term, there is an empt
   });
 
   andThen(() => {
-    assert.ok(find('.empty-message'));
-    assert.equal(find('.empty-message-headline').textContent, 'No Matches');
+    assert.ok(find('[data-test-empty-clients-list]'));
+    assert.equal(find('[data-test-empty-clients-list-headline]').textContent, 'No Matches');
   });
 });
 
@@ -112,11 +136,11 @@ test('when accessing clients is forbidden, show a message with a link to the tok
   visit('/clients');
 
   andThen(() => {
-    assert.equal(find('.empty-message-headline').textContent, 'Not Authorized');
+    assert.equal(find('[data-test-error-title]').textContent, 'Not Authorized');
   });
 
   andThen(() => {
-    click('.empty-message-body a');
+    click('[data-test-error-message] a');
   });
 
   andThen(() => {
@@ -136,7 +160,7 @@ test('/servers should list all servers', function(assert) {
   visit('/servers');
 
   andThen(() => {
-    assert.equal(findAll('.server-agent-row').length, pageSize);
+    assert.equal(findAll('[data-test-server-agent-row]').length, pageSize);
 
     const sortedAgents = server.db.agents
       .sort((a, b) => {
@@ -150,10 +174,11 @@ test('/servers should list all servers', function(assert) {
       .reverse();
 
     for (var agentNumber = 0; agentNumber < 8; agentNumber++) {
+      const serverRow = findAll('[data-test-server-agent-row]')[agentNumber];
       assert.equal(
-        $(`.server-agent-row:eq(${agentNumber}) td:eq(0)`).text(),
+        serverRow.querySelector('[data-test-server-name]').textContent.trim(),
         sortedAgents[agentNumber].name,
-        'Clients are ordered'
+        'Servers are ordered'
       );
     }
   });
@@ -166,14 +191,34 @@ test('each server should show high-level info of the server', function(assert) {
   visit('/servers');
 
   andThen(() => {
-    const agentRow = $(findAll('.server-agent-row')[0]);
+    const agentRow = find('[data-test-server-agent-row]');
 
-    assert.equal(agentRow.find('td:eq(0)').text(), agent.name, 'Name');
-    assert.equal(agentRow.find('td:eq(1)').text(), agent.status, 'Status');
-    assert.equal(agentRow.find('td:eq(2)').text(), 'True', 'Leader?');
-    assert.equal(agentRow.find('td:eq(3)').text(), agent.address, 'Address');
-    assert.equal(agentRow.find('td:eq(4)').text(), agent.serf_port, 'Serf Port');
-    assert.equal(agentRow.find('td:eq(5)').text(), agent.tags.dc, 'Datacenter');
+    assert.equal(agentRow.querySelector('[data-test-server-name]').textContent, agent.name, 'Name');
+    assert.equal(
+      agentRow.querySelector('[data-test-server-status]').textContent,
+      agent.status,
+      'Status'
+    );
+    assert.equal(
+      agentRow.querySelector('[data-test-server-is-leader]').textContent,
+      'True',
+      'Leader?'
+    );
+    assert.equal(
+      agentRow.querySelector('[data-test-server-address]').textContent,
+      agent.address,
+      'Address'
+    );
+    assert.equal(
+      agentRow.querySelector('[data-test-server-port]').textContent,
+      agent.serf_port,
+      'Serf Port'
+    );
+    assert.equal(
+      agentRow.querySelector('[data-test-server-datacenter]').textContent,
+      agent.tags.dc,
+      'Datacenter'
+    );
   });
 });
 
@@ -183,7 +228,7 @@ test('each server should link to the server detail page', function(assert) {
 
   visit('/servers');
   andThen(() => {
-    click(findAll('.server-agent-row')[0]);
+    click('[data-test-server-agent-row]');
   });
 
   andThen(() => {
@@ -200,11 +245,11 @@ test('when accessing servers is forbidden, show a message with a link to the tok
   visit('/servers');
 
   andThen(() => {
-    assert.equal(find('.empty-message-headline').textContent, 'Not Authorized');
+    assert.equal(find('[data-test-error-title]').textContent, 'Not Authorized');
   });
 
   andThen(() => {
-    click('.empty-message-body a');
+    click('[data-test-error-message] a');
   });
 
   andThen(() => {
diff --git a/ui/tests/acceptance/server-detail-test.js b/ui/tests/acceptance/server-detail-test.js
index 07c14324c..1ef079e4a 100644
--- a/ui/tests/acceptance/server-detail-test.js
+++ b/ui/tests/acceptance/server-detail-test.js
@@ -20,7 +20,7 @@ test('visiting /servers/:server_name', function(assert) {
 test('the server detail page should list all tags for the server', function(assert) {
   const tags = agent.tags;
 
-  assert.equal(findAll('.server-tags tbody tr').length, Object.keys(tags).length, '# of tags');
+  assert.equal(findAll('[data-test-server-tag]').length, Object.keys(tags).length, '# of tags');
   Object.keys(tags)
     .map(name => ({ name, value: tags[name] }))
     .sortBy('name')
@@ -32,13 +32,21 @@ test('the server detail page should list all tags for the server', function(asse
 });
 
 test('the list of servers from /servers should still be present', function(assert) {
-  assert.equal(findAll('.server-agent-row').length, server.db.agents.length, '# of servers');
+  assert.equal(
+    findAll('[data-test-server-agent-row]').length,
+    server.db.agents.length,
+    '# of servers'
+  );
 });
 
 test('the active server should be denoted in the table', function(assert) {
-  assert.equal(findAll('.server-agent-row.is-active').length, 1, 'Only one active server');
   assert.equal(
-    findAll('.server-agent-row.is-active td')[0].textContent,
+    findAll('[data-test-server-agent-row].is-active').length,
+    1,
+    'Only one active server'
+  );
+  assert.equal(
+    find('[data-test-server-agent-row].is-active [data-test-server-name]').textContent.trim(),
     agent.name,
     'Active server matches current route'
   );
@@ -51,9 +59,9 @@ test('when the server is not found, an error message is shown, but the URL persi
 
   andThen(() => {
     assert.equal(currentURL(), '/servers/not-a-real-server', 'The URL persists');
-    assert.ok(find('.error-message'), 'Error message is shown');
+    assert.ok(find('[data-test-error]'), 'Error message is shown');
     assert.equal(
-      find('.error-message .title').textContent,
+      find('[data-test-error-title]').textContent,
       'Not Found',
       'Error message is for 404'
     );
diff --git a/ui/tests/acceptance/task-detail-test.js b/ui/tests/acceptance/task-detail-test.js
index 84dd97708..b0cbc65da 100644
--- a/ui/tests/acceptance/task-detail-test.js
+++ b/ui/tests/acceptance/task-detail-test.js
@@ -1,4 +1,3 @@
-import $ from 'jquery';
 import { click, findAll, currentURL, find, visit } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
@@ -25,36 +24,40 @@ moduleForAcceptance('Acceptance | task detail', {
 test('/allocation/:id/:task_name should name the task and list high-level task information', function(
   assert
 ) {
-  assert.ok(find('.title').textContent.includes(task.name), 'Task name');
-  assert.ok(find('.title').textContent.includes(task.state), 'Task state');
+  assert.ok(find('[data-test-title]').textContent.includes(task.name), 'Task name');
+  assert.ok(find('[data-test-state]').textContent.includes(task.state), 'Task state');
 
-  const inlineDefinitions = findAll('.inline-definitions .pair');
   assert.ok(
-    inlineDefinitions[0].textContent.includes(moment(task.startedAt).format('MM/DD/YY HH:mm:ss')),
+    find('[data-test-started-at]').textContent.includes(
+      moment(task.startedAt).format('MM/DD/YY HH:mm:ss')
+    ),
     'Task started at'
   );
 });
 
 test('breadcrumbs includes allocations and link to the allocation detail page', function(assert) {
-  const breadcrumbs = findAll('.breadcrumb a');
   assert.equal(
-    breadcrumbs[0].textContent.trim(),
+    find('[data-test-breadcrumb="allocations"]').textContent.trim(),
     'Allocations',
     'Allocations is the first breadcrumb'
   );
   assert.equal(
-    breadcrumbs[0].getAttribute('href'),
+    find('[data-test-breadcrumb="allocations"]').getAttribute('href'),
     '#',
     "Allocations breadcrumb doesn't link anywhere"
   );
   assert.equal(
-    breadcrumbs[1].textContent.trim(),
+    find('[data-test-breadcrumb="allocation"]').textContent.trim(),
     allocation.id.split('-')[0],
     'Allocation short id is the second breadcrumb'
   );
-  assert.equal(breadcrumbs[2].textContent.trim(), task.name, 'Task name is the third breadcrumb');
+  assert.equal(
+    find('[data-test-breadcrumb="task"]').textContent.trim(),
+    task.name,
+    'Task name is the third breadcrumb'
+  );
 
-  click(breadcrumbs[1]);
+  click('[data-test-breadcrumb="allocation"]');
   andThen(() => {
     assert.equal(
       currentURL(),
@@ -73,7 +76,7 @@ test('the addresses table lists all reserved and dynamic ports', function(assert
   const addresses = reservedPorts.concat(dynamicPorts);
 
   assert.equal(
-    findAll('.addresses-list tbody tr').length,
+    findAll('[data-test-task-address]').length,
     addresses.length,
     'All addresses are listed'
   );
@@ -88,28 +91,19 @@ test('each address row shows the label and value of the address', function(asser
   const dynamicPorts = taskResources.resources.Networks[0].DynamicPorts;
   const address = reservedPorts.concat(dynamicPorts).sortBy('Label')[0];
 
-  const addressRow = $(find('.addresses-list tbody tr'));
+  const addressRow = find('[data-test-task-address]');
   assert.equal(
-    addressRow
-      .find('td:eq(0)')
-      .text()
-      .trim(),
+    addressRow.querySelector('[data-test-task-address-is-dynamic]').textContent.trim(),
     reservedPorts.includes(address) ? 'No' : 'Yes',
     'Dynamic port is denoted as such'
   );
   assert.equal(
-    addressRow
-      .find('td:eq(1)')
-      .text()
-      .trim(),
+    addressRow.querySelector('[data-test-task-address-name]').textContent.trim(),
     address.Label,
     'Label'
   );
   assert.equal(
-    addressRow
-      .find('td:eq(2)')
-      .text()
-      .trim(),
+    addressRow.querySelector('[data-test-task-address-address]').textContent.trim(),
     `${ipParts(node.httpAddr).address}:${address.Value}`,
     'Value'
   );
@@ -119,7 +113,7 @@ test('the events table lists all recent events', function(assert) {
   const events = server.db.taskEvents.where({ taskStateId: task.id });
 
   assert.equal(
-    findAll('.task-events tbody tr').length,
+    findAll('[data-test-task-event]').length,
     events.length,
     `Lists ${events.length} events`
   );
@@ -129,29 +123,20 @@ test('each recent event should list the time, type, and description of the event
   assert
 ) {
   const event = server.db.taskEvents.where({ taskStateId: task.id })[0];
-  const recentEvent = $('.task-events tbody tr:last');
+  const recentEvent = findAll('[data-test-task-event]').get('lastObject');
 
   assert.equal(
-    recentEvent
-      .find('td:eq(0)')
-      .text()
-      .trim(),
+    recentEvent.querySelector('[data-test-task-event-time]').textContent.trim(),
     moment(event.time / 1000000).format('MM/DD/YY HH:mm:ss'),
     'Event timestamp'
   );
   assert.equal(
-    recentEvent
-      .find('td:eq(1)')
-      .text()
-      .trim(),
+    recentEvent.querySelector('[data-test-task-event-type]').textContent.trim(),
     event.type,
     'Event type'
   );
   assert.equal(
-    recentEvent
-      .find('td:eq(2)')
-      .text()
-      .trim(),
+    recentEvent.querySelector('[data-test-task-event-message]').textContent.trim(),
     event.message,
     'Event message'
   );
@@ -171,9 +156,9 @@ test('when the allocation is not found, the application errors', function(assert
       `/allocations/not-a-real-allocation/${task.name}`,
       'The URL persists'
     );
-    assert.ok(find('.error-message'), 'Error message is shown');
+    assert.ok(find('[data-test-error]'), 'Error message is shown');
     assert.equal(
-      find('.error-message .title').textContent,
+      find('[data-test-error-title]').textContent,
       'Not Found',
       'Error message is for 404'
     );
@@ -194,9 +179,9 @@ test('when the allocation is found but the task is not, the application errors',
       `/allocations/${allocation.id}/not-a-real-task-name`,
       'The URL persists'
     );
-    assert.ok(find('.error-message'), 'Error message is shown');
+    assert.ok(find('[data-test-error]'), 'Error message is shown');
     assert.equal(
-      find('.error-message .title').textContent,
+      find('[data-test-error-title]').textContent,
       'Not Found',
       'Error message is for 404'
     );
@@ -216,5 +201,5 @@ moduleForAcceptance('Acceptance | task detail (no addresses)', {
 });
 
 test('when the task has no addresses, the addresses table is not shown', function(assert) {
-  assert.notOk(find('.addresses-list'), 'No addresses table');
+  assert.notOk(find('[data-test-task-addresses]'), 'No addresses table');
 });
diff --git a/ui/tests/acceptance/task-group-detail-test.js b/ui/tests/acceptance/task-group-detail-test.js
index 1757f42a9..c9665b966 100644
--- a/ui/tests/acceptance/task-group-detail-test.js
+++ b/ui/tests/acceptance/task-group-detail-test.js
@@ -1,4 +1,3 @@
-import $ from 'jquery';
 import { click, find, findAll, fillIn, currentURL, visit } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
@@ -56,22 +55,22 @@ test('/jobs/:id/:task-group should list high-level metrics for the allocation',
   const totalDisk = taskGroup.ephemeralDisk.SizeMB;
 
   assert.equal(
-    findAll('.inline-definitions .pair')[0].textContent,
+    find('[data-test-task-group-tasks]').textContent,
     `# Tasks ${tasks.length}`,
     '# Tasks'
   );
   assert.equal(
-    findAll('.inline-definitions .pair')[1].textContent,
+    find('[data-test-task-group-cpu]').textContent,
     `Reserved CPU ${totalCPU} MHz`,
     'Aggregated CPU reservation for all tasks'
   );
   assert.equal(
-    findAll('.inline-definitions .pair')[2].textContent,
+    find('[data-test-task-group-mem]').textContent,
     `Reserved Memory ${totalMemory} MiB`,
     'Aggregated Memory reservation for all tasks'
   );
   assert.equal(
-    findAll('.inline-definitions .pair')[3].textContent,
+    find('[data-test-task-group-disk]').textContent,
     `Reserved Disk ${totalDisk} MiB`,
     'Aggregated Disk reservation for all tasks'
   );
@@ -79,24 +78,24 @@ test('/jobs/:id/:task-group should list high-level metrics for the allocation',
 
 test('/jobs/:id/:task-group should have breadcrumbs for job and jobs', function(assert) {
   assert.equal(
-    findAll('.breadcrumb a')[0].textContent.trim(),
+    find('[data-test-breadcrumb="Jobs"]').textContent.trim(),
     'Jobs',
     'First breadcrumb says jobs'
   );
   assert.equal(
-    findAll('.breadcrumb a')[1].textContent.trim(),
+    find(`[data-test-breadcrumb="${job.name}"]`).textContent.trim(),
     job.name,
     'Second breadcrumb says the job name'
   );
   assert.equal(
-    findAll('.breadcrumb a')[2].textContent.trim(),
+    find(`[data-test-breadcrumb="${taskGroup.name}"]`).textContent.trim(),
     taskGroup.name,
     'Third breadcrumb says the job name'
   );
 });
 
 test('/jobs/:id/:task-group first breadcrumb should link to jobs', function(assert) {
-  click(findAll('.breadcrumb a')[0]);
+  click('[data-test-breadcrumb="Jobs"]');
   andThen(() => {
     assert.equal(currentURL(), '/jobs', 'First breadcrumb links back to jobs');
   });
@@ -105,7 +104,7 @@ test('/jobs/:id/:task-group first breadcrumb should link to jobs', function(asse
 test('/jobs/:id/:task-group second breadcrumb should link to the job for the task group', function(
   assert
 ) {
-  click(findAll('.breadcrumb a')[1]);
+  click(`[data-test-breadcrumb="${job.name}"]`);
   andThen(() => {
     assert.equal(
       currentURL(),
@@ -135,7 +134,7 @@ test('/jobs/:id/:task-group should list one page of allocations for the task gro
     );
 
     assert.equal(
-      findAll('.allocations tbody tr').length,
+      findAll('[data-test-allocation]').length,
       pageSize,
       'All allocations for the task group'
     );
@@ -144,60 +143,42 @@ test('/jobs/:id/:task-group should list one page of allocations for the task gro
 
 test('each allocation should show basic information about the allocation', function(assert) {
   const allocation = allocations.sortBy('modifyIndex').reverse()[0];
-  const allocationRow = $(findAll('.allocations tbody tr')[0]);
+  const allocationRow = find('[data-test-allocation]');
 
   andThen(() => {
     assert.equal(
-      allocationRow
-        .find('td:eq(0)')
-        .text()
-        .trim(),
+      allocationRow.querySelector('[data-test-short-id]').textContent.trim(),
       allocation.id.split('-')[0],
       'Allocation short id'
     );
     assert.equal(
-      allocationRow
-        .find('td:eq(1)')
-        .text()
-        .trim(),
+      allocationRow.querySelector('[data-test-modify-time]').textContent.trim(),
       moment(allocation.modifyTime / 1000000).format('MM/DD HH:mm:ss'),
       'Allocation modify time'
     );
     assert.equal(
-      allocationRow
-        .find('td:eq(2)')
-        .text()
-        .trim(),
+      allocationRow.querySelector('[data-test-name]').textContent.trim(),
       allocation.name,
       'Allocation name'
     );
     assert.equal(
-      allocationRow
-        .find('td:eq(3)')
-        .text()
-        .trim(),
+      allocationRow.querySelector('[data-test-client-status]').textContent.trim(),
       allocation.clientStatus,
       'Client status'
     );
     assert.equal(
-      allocationRow
-        .find('td:eq(4)')
-        .text()
-        .trim(),
+      allocationRow.querySelector('[data-test-job-version]').textContent.trim(),
       allocation.jobVersion,
       'Job Version'
     );
     assert.equal(
-      allocationRow
-        .find('td:eq(5)')
-        .text()
-        .trim(),
+      allocationRow.querySelector('[data-test-client]').textContent.trim(),
       server.db.nodes.find(allocation.nodeId).id.split('-')[0],
       'Node ID'
     );
   });
 
-  click(allocationRow.find('td:eq(5) a').get(0));
+  click(allocationRow.querySelector('[data-test-client] a'));
 
   andThen(() => {
     assert.equal(currentURL(), `/clients/${allocation.nodeId}`, 'Node links to node page');
@@ -208,7 +189,7 @@ test('each allocation should show stats about the allocation, retrieved directly
   assert
 ) {
   const allocation = allocations.sortBy('name')[0];
-  const allocationRow = $(findAll('.allocations tbody tr')[0]);
+  const allocationRow = find('[data-test-allocation]');
   const allocStats = server.db.clientAllocationStats.find(allocation.id);
   const tasks = taskGroup.taskIds.map(id => server.db.tasks.find(id));
 
@@ -216,31 +197,25 @@ test('each allocation should show stats about the allocation, retrieved directly
   const memoryUsed = tasks.reduce((sum, task) => sum + task.Resources.MemoryMB, 0);
 
   assert.equal(
-    allocationRow
-      .find('td:eq(6)')
-      .text()
-      .trim(),
+    allocationRow.querySelector('[data-test-cpu]').textContent.trim(),
     Math.floor(allocStats.resourceUsage.CpuStats.TotalTicks) / cpuUsed,
     'CPU %'
   );
 
   assert.equal(
-    allocationRow.find('td:eq(6) .tooltip').attr('aria-label'),
+    allocationRow.querySelector('[data-test-cpu] .tooltip').getAttribute('aria-label'),
     `${Math.floor(allocStats.resourceUsage.CpuStats.TotalTicks)} / ${cpuUsed} MHz`,
     'Detailed CPU information is in a tooltip'
   );
 
   assert.equal(
-    allocationRow
-      .find('td:eq(7)')
-      .text()
-      .trim(),
+    allocationRow.querySelector('[data-test-mem]').textContent.trim(),
     allocStats.resourceUsage.MemoryStats.RSS / 1024 / 1024 / memoryUsed,
     'Memory used'
   );
 
   assert.equal(
-    allocationRow.find('td:eq(7) .tooltip').attr('aria-label'),
+    allocationRow.querySelector('[data-test-mem] .tooltip').getAttribute('aria-label'),
     `${formatBytes([allocStats.resourceUsage.MemoryStats.RSS])} / ${memoryUsed} MiB`,
     'Detailed memory information is in a tooltip'
   );
@@ -258,7 +233,7 @@ test('when the allocation search has no matches, there is an empty message', fun
   fillIn('.search-box input', 'zzzzzz');
 
   andThen(() => {
-    assert.ok(find('.allocations .empty-message'));
-    assert.equal(find('.allocations .empty-message-headline').textContent, 'No Matches');
+    assert.ok(find('[data-test-empty-allocations-list]'));
+    assert.equal(find('[data-test-empty-allocations-list-headline]').textContent, 'No Matches');
   });
 });
diff --git a/ui/tests/acceptance/task-logs-test.js b/ui/tests/acceptance/task-logs-test.js
index 9d75fa391..e59fb6af2 100644
--- a/ui/tests/acceptance/task-logs-test.js
+++ b/ui/tests/acceptance/task-logs-test.js
@@ -22,7 +22,7 @@ moduleForAcceptance('Acceptance | task logs', {
 
 test('/allocation/:id/:task_name/logs should have a log component', function(assert) {
   assert.equal(currentURL(), `/allocations/${allocation.id}/${task.name}/logs`, 'No redirect');
-  assert.ok(find('.task-log'), 'Task log component found');
+  assert.ok(find('[data-test-task-log]'), 'Task log component found');
 });
 
 test('the stdout log immediately starts streaming', function(assert) {
diff --git a/ui/tests/acceptance/token-test.js b/ui/tests/acceptance/token-test.js
index 028f0d708..110d72010 100644
--- a/ui/tests/acceptance/token-test.js
+++ b/ui/tests/acceptance/token-test.js
@@ -1,4 +1,3 @@
-import $ from 'jquery';
 import { find, findAll, fillIn, click, visit } from 'ember-native-dom-helpers';
 import { test, skip } from 'ember-qunit';
 import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance';
@@ -26,8 +25,8 @@ test('the token form sets the token in session storage', function(assert) {
   andThen(() => {
     assert.ok(window.sessionStorage.nomadTokenSecret == null, 'No token secret set');
 
-    fillIn('.token-secret', secretId);
-    click('.token-submit');
+    fillIn('[data-test-token-secret]', secretId);
+    click('[data-test-token-submit]');
 
     andThen(() => {
       assert.equal(window.sessionStorage.nomadTokenSecret, secretId, 'Token secret was set');
@@ -55,8 +54,8 @@ skip('the X-Nomad-Token header gets sent with requests once it is set', function
 
   visit('/settings/tokens');
   andThen(() => {
-    fillIn('.token-secret', secretId);
-    click('.token-submit');
+    fillIn('[data-test-token-secret]', secretId);
+    click('[data-test-token-submit]');
   });
 
   visit(`/jobs/${job.id}`);
@@ -85,17 +84,17 @@ test('an error message is shown when authenticating a token fails', function(ass
   visit('/settings/tokens');
 
   andThen(() => {
-    fillIn('.token-secret', bogusSecret);
-    click('.token-submit');
+    fillIn('[data-test-token-secret]', bogusSecret);
+    click('[data-test-token-submit]');
 
     andThen(() => {
       assert.ok(
         window.sessionStorage.nomadTokenSecret == null,
         'Token secret is discarded on failure'
       );
-      assert.ok(find('.token-error'), 'Token error message is shown');
-      assert.notOk(find('.token-success'), 'Token success message is not shown');
-      assert.notOk(find('.token-policy'), 'No token policies are shown');
+      assert.ok(find('[data-test-token-error]'), 'Token error message is shown');
+      assert.notOk(find('[data-test-token-success]'), 'Token success message is not shown');
+      assert.notOk(find('[data-test-token-policy]'), 'No token policies are shown');
     });
   });
 });
@@ -108,14 +107,14 @@ test('a success message and a special management token message are shown when au
   visit('/settings/tokens');
 
   andThen(() => {
-    fillIn('.token-secret', secretId);
-    click('.token-submit');
+    fillIn('[data-test-token-secret]', secretId);
+    click('[data-test-token-submit]');
 
     andThen(() => {
-      assert.ok(find('.token-success'), 'Token success message is shown');
-      assert.notOk(find('.token-error'), 'Token error message is not shown');
-      assert.ok(find('.token-management-message'), 'Token management message is shown');
-      assert.notOk(find('.token-policy'), 'No token policies are shown');
+      assert.ok(find('[data-test-token-success]'), 'Token success message is shown');
+      assert.notOk(find('[data-test-token-error]'), 'Token error message is not shown');
+      assert.ok(find('[data-test-token-management-message]'), 'Token management message is shown');
+      assert.notOk(find('[data-test-token-policy]'), 'No token policies are shown');
     });
   });
 });
@@ -130,39 +129,36 @@ test('a success message and associated policies are shown when authenticating su
   visit('/settings/tokens');
 
   andThen(() => {
-    fillIn('.token-secret', secretId);
-    click('.token-submit');
+    fillIn('[data-test-token-secret]', secretId);
+    click('[data-test-token-submit]');
 
     andThen(() => {
-      assert.ok(find('.token-success'), 'Token success message is shown');
-      assert.notOk(find('.token-error'), 'Token error message is not shown');
-      assert.notOk(find('.token-management-message'), 'Token management message is not shown');
+      assert.ok(find('[data-test-token-success]'), 'Token success message is shown');
+      assert.notOk(find('[data-test-token-error]'), 'Token error message is not shown');
+      assert.notOk(
+        find('[data-test-token-management-message]'),
+        'Token management message is not shown'
+      );
       assert.equal(
-        findAll('.token-policy').length,
+        findAll('[data-test-token-policy]').length,
         clientToken.policies.length,
         'Each policy associated with the token is listed'
       );
 
-      const policyElement = $(find('.token-policy'));
+      const policyElement = find('[data-test-token-policy]');
 
       assert.equal(
-        policyElement
-          .find('.boxed-section-head')
-          .text()
-          .trim(),
+        policyElement.querySelector('[data-test-policy-name]').textContent.trim(),
         policy.name,
         'Policy Name'
       );
       assert.equal(
-        policyElement
-          .find('.boxed-section-body p.content')
-          .text()
-          .trim(),
+        policyElement.querySelector('[data-test-policy-description]').textContent.trim(),
         policy.description,
         'Policy Description'
       );
       assert.equal(
-        policyElement.find('.boxed-section-body pre code').text(),
+        policyElement.querySelector('[data-test-policy-rules]').textContent,
         policy.rules,
         'Policy Rules'
       );
@@ -182,8 +178,8 @@ test('setting a token clears the store', function(assert) {
   visit('/settings/tokens');
 
   andThen(() => {
-    fillIn('.token-secret', secretId);
-    click('.token-submit');
+    fillIn('[data-test-token-secret]', secretId);
+    click('[data-test-token-submit]');
   });
 
   // Don't return jobs from the API the second time around
@@ -196,7 +192,7 @@ test('setting a token clears the store', function(assert) {
   visit('/jobs');
 
   // If jobs are lingering in the store, they would show up
-  assert.notOk(find('.job-row'), 'No jobs found');
+  assert.notOk(find('[data-test-job-row]'), 'No jobs found');
 });
 
 function getHeader({ requestHeaders }, name) {

From efbe0c1faf31c1fc0a2facabe58094154b4e6e3a Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Fri, 5 Jan 2018 15:58:58 -0800
Subject: [PATCH 29/48] Switch from phantomjs to headless chrome

---
 ui/testem.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ui/testem.js b/ui/testem.js
index 9a0e1deb1..630bfd548 100644
--- a/ui/testem.js
+++ b/ui/testem.js
@@ -2,6 +2,21 @@
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
-  launch_in_ci: ['PhantomJS'],
+  launch_in_ci: ['Chrome'],
   launch_in_dev: ['Chrome'],
+  browser_args: {
+    // New format in testem/master, but not in a release yet
+    // Chrome: {
+    //   ci: ['--headless', '--disable-gpu', '--remote-debugging-port=9222', '--window-size=1440,900'],
+    // },
+    Chrome: {
+      mode: 'ci',
+      args: [
+        '--headless',
+        '--disable-gpu',
+        '--remote-debugging-port=9222',
+        '--window-size=1440,900',
+      ],
+    },
+  },
 };

From 14adc01f68ec4469a7b25616169b397707e872aa Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Fri, 5 Jan 2018 17:24:57 -0800
Subject: [PATCH 30/48] Upgrade testing related dependencies

---
 ui/package.json |  14 +---
 ui/yarn.lock    | 208 +++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 164 insertions(+), 58 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index 5ae3fa696..db06268b6 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -20,10 +20,7 @@
         "prettier --single-quote --trailing-comma es5 --print-width 100 --write",
         "git add"
       ],
-      "ui/app/styles/**/*.*": [
-        "prettier --write",
-        "git add"
-      ]
+      "ui/app/styles/**/*.*": ["prettier --write", "git add"]
     }
   },
   "devDependencies": {
@@ -44,7 +41,7 @@
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-mirage": "^0.4.1",
     "ember-cli-moment-shim": "^3.5.0",
-    "ember-cli-qunit": "^4.0.0",
+    "ember-cli-qunit": "^4.2.1",
     "ember-cli-sass": "^7.1.2",
     "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
@@ -63,7 +60,7 @@
     "ember-native-dom-helpers": "^0.5.4",
     "ember-power-select": "^1.10.4",
     "ember-resolver": "^4.5.0",
-    "ember-sinon": "^0.7.0",
+    "ember-sinon": "^1.0.1",
     "ember-source": "~2.17.0",
     "ember-test-selectors": "^0.3.8",
     "ember-truth-helpers": "^2.0.0",
@@ -82,9 +79,6 @@
   },
   "private": true,
   "ember-addon": {
-    "paths": [
-      "lib/bulma",
-      "lib/calendar"
-    ]
+    "paths": ["lib/bulma", "lib/calendar"]
   }
 }
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 016fbf6bf..cbbce95f5 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -2,6 +2,14 @@
 # yarn lockfile v1
 
 
+"@ember/test-helpers@^0.7.9":
+  version "0.7.13"
+  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-0.7.13.tgz#89523a101b5bd731e9dcaf7d0c57155b6386a4e3"
+  dependencies:
+    broccoli-funnel "^2.0.1"
+    ember-cli-babel "^6.10.0"
+    ember-cli-htmlbars-inline-precompile "^1.0.0"
+
 "@glimmer/di@^0.2.0":
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e"
@@ -345,6 +353,10 @@ async@~0.2.9:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
 
+async@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1327,7 +1339,7 @@ broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
-broccoli-funnel@^2.0.0:
+broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.1.tgz#6823c73b675ef78fffa7ab800f083e768b51d449"
   dependencies:
@@ -1371,7 +1383,7 @@ broccoli-lint-eslint@^4.2.1:
     lodash.defaultsdeep "^4.6.0"
     md5-hex "^2.0.0"
 
-broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.2, broccoli-merge-trees@^1.2.1:
+broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
   dependencies:
@@ -1709,6 +1721,21 @@ buffer@^4.1.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+build@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/build/-/build-0.1.4.tgz#707fe026ffceddcacbfdcdf356eafda64f151046"
+  dependencies:
+    cssmin "0.3.x"
+    jsmin "1.x"
+    jxLoader "*"
+    moo-server "*"
+    promised-io "*"
+    timespan "2.x"
+    uglify-js "1.x"
+    walker "1.x"
+    winston "*"
+    wrench "1.3.x"
+
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -2009,7 +2036,7 @@ color-name@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
-colors@1.0.3:
+colors@1.0.3, colors@1.0.x:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
@@ -2048,6 +2075,12 @@ commander@~2.12.1:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
 
+common-tags@^1.4.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.6.0.tgz#788e4bcc582f16993e5b2c92f76b1ccb80731537"
+  dependencies:
+    babel-runtime "^6.26.0"
+
 commoner@~0.10.3:
   version "0.10.8"
   resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5"
@@ -2295,6 +2328,10 @@ crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
 
+cssmin@0.3.x:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cssmin/-/cssmin-0.3.2.tgz#ddce4c547b510ae0d594a8f1fbf8aaf8e2c5c00d"
+
 csso@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/csso/-/csso-2.0.0.tgz#178b43a44621221c27756086f531e02f42900ee8"
@@ -2308,6 +2345,10 @@ currently-unhandled@^0.4.1:
   dependencies:
     array-find-index "^1.0.1"
 
+cycle@1.0.x:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
+
 d3-color@1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.3.tgz#bc7643fca8e53a8347e2fbdaffa236796b58509b"
@@ -2743,7 +2784,7 @@ ember-cli-get-dependency-depth@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-get-dependency-depth/-/ember-cli-get-dependency-depth-1.0.0.tgz#e0afecf82a2d52f00f28ab468295281aec368d11"
 
-ember-cli-htmlbars-inline-precompile@^1.0.2:
+ember-cli-htmlbars-inline-precompile@^1.0.0, ember-cli-htmlbars-inline-precompile@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-1.0.2.tgz#5b544f664d5d9911f08cd979c5f70d8cb0ca2add"
   dependencies:
@@ -2883,20 +2924,12 @@ ember-cli-preprocess-registry@^3.1.0:
     process-relative-require "^1.0.0"
     silent-error "^1.0.0"
 
-ember-cli-qunit@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-4.0.0.tgz#1f0022469a5bd64f627b8102880a25e94e533a3b"
+ember-cli-qunit@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-4.2.1.tgz#89580e6eb157ee98b9eefbd48fba9bb75ea64544"
   dependencies:
-    broccoli-funnel "^1.0.1"
-    broccoli-merge-trees "^2.0.0"
-    ember-cli-babel "^6.0.0-beta.7"
-    ember-cli-test-loader "^2.0.0"
-    ember-cli-version-checker "^1.1.4"
-    ember-qunit "^2.1.3"
-    qunit-notifications "^0.1.1"
-    qunitjs "^2.0.1"
-    resolve "^1.1.6"
-    silent-error "^1.0.0"
+    ember-cli-babel "^6.8.1"
+    ember-qunit "^3.2.2"
 
 ember-cli-sass@^6.1.3:
   version "6.2.0"
@@ -2965,7 +2998,7 @@ ember-cli-test-info@^1.0.0:
   dependencies:
     ember-cli-string-utils "^1.0.0"
 
-ember-cli-test-loader@^2.0.0:
+ember-cli-test-loader@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.2.0.tgz#3fb8d5d1357e4460d3f0a092f5375e71b6f7c243"
   dependencies:
@@ -3301,11 +3334,17 @@ ember-power-select@^1.10.4:
     ember-text-measurer "^0.4.0"
     ember-truth-helpers "^2.0.0"
 
-ember-qunit@^2.1.3:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-2.2.0.tgz#3cdf400031c93a38de781a7304819738753b7f99"
+ember-qunit@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-3.2.2.tgz#96c8818ecfa3894580a3dc805f7e7f1e82e07c4a"
   dependencies:
-    ember-test-helpers "^0.6.3"
+    "@ember/test-helpers" "^0.7.9"
+    broccoli-funnel "^2.0.1"
+    broccoli-merge-trees "^2.0.0"
+    common-tags "^1.4.0"
+    ember-cli-babel "^6.3.0"
+    ember-cli-test-loader "^2.2.0"
+    qunit "^2.4.1"
 
 ember-resolver@^4.5.0:
   version "4.5.0"
@@ -3340,14 +3379,14 @@ ember-runtime-enumerable-includes-polyfill@^2.0.0:
     ember-cli-babel "^6.0.0"
     ember-cli-version-checker "^1.1.6"
 
-ember-sinon@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/ember-sinon/-/ember-sinon-0.7.0.tgz#41b83b5b1c71626db26e8ffb4a52cdab9c039a29"
+ember-sinon@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ember-sinon/-/ember-sinon-1.0.1.tgz#056390eacc9367b4c3955ce1cb5a04246f8197f5"
   dependencies:
-    broccoli-funnel "^1.1.0"
-    broccoli-merge-trees "^1.2.1"
-    ember-cli-babel "^5.1.7"
-    sinon "^2.1.0"
+    broccoli-funnel "^2.0.0"
+    broccoli-merge-trees "^2.0.0"
+    ember-cli-babel "^6.3.0"
+    sinon "^3.2.1"
 
 ember-source@~2.17.0:
   version "2.17.0"
@@ -3369,10 +3408,6 @@ ember-source@~2.17.0:
     jquery "^3.2.1"
     resolve "^1.3.3"
 
-ember-test-helpers@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/ember-test-helpers/-/ember-test-helpers-0.6.3.tgz#f864cdf6f4e75f3f8768d6537785b5ab6e82d907"
-
 ember-test-selectors@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-0.3.8.tgz#1e8ae3e78c64bacc4bbfe87f9973c85805699db2"
@@ -3892,6 +3927,10 @@ extsprintf@1.3.0, extsprintf@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
 
+eyes@0.1.x:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
+
 fake-xml-http-request@^1.4.0, fake-xml-http-request@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-1.6.0.tgz#bd0ac79ae3e2660098282048a12c730a6f64d550"
@@ -4067,7 +4106,7 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
-formatio@1.2.0:
+formatio@1.2.0, formatio@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.2.0.tgz#f3b2167d9068c4698a8d51f4f760a39a54d818eb"
   dependencies:
@@ -4874,7 +4913,7 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
-isstream@~0.1.2:
+isstream@0.1.x, isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
@@ -4906,6 +4945,10 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
+js-yaml@0.3.x:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-0.3.7.tgz#d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"
+
 js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.4.3, js-yaml@^3.6.1, js-yaml@^3.9.1:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
@@ -4944,6 +4987,10 @@ jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
+jsmin@1.x:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/jsmin/-/jsmin-1.0.1.tgz#e7bd0dcd6496c3bf4863235bf461a3d98aa3b98c"
+
 json-formatter-js@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/json-formatter-js/-/json-formatter-js-2.2.0.tgz#1ed987223ef2f1d945304597faae78b580a8212b"
@@ -5017,6 +5064,19 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+just-extend@^1.1.26:
+  version "1.1.27"
+  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.27.tgz#ec6e79410ff914e472652abfa0e603c03d60e905"
+
+jxLoader@*:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jxLoader/-/jxLoader-0.1.1.tgz#0134ea5144e533b594fc1ff25ff194e235c53ecd"
+  dependencies:
+    js-yaml "0.3.x"
+    moo-server "1.3.x"
+    promised-io "*"
+    walker "1.x"
+
 kind-of@^3.0.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -5422,6 +5482,10 @@ lodash.forown@~2.3.0:
     lodash._objecttypes "~2.3.0"
     lodash.keys "~2.3.0"
 
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+
 lodash.identity@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/lodash.identity/-/lodash.identity-2.3.0.tgz#6b01a210c9485355c2a913b48b6711219a173ded"
@@ -5582,6 +5646,10 @@ lolex@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
 
+lolex@^2.1.2:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.3.1.tgz#3d2319894471ea0950ef64692ead2a5318cff362"
+
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -5858,6 +5926,10 @@ moment-timezone@^0.5.13:
   version "2.18.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
 
+moo-server@*, moo-server@1.3.x:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/moo-server/-/moo-server-1.3.0.tgz#5dc79569565a10d6efed5439491e69d2392e58f1"
+
 morgan@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.8.2.tgz#784ac7734e4a453a9c6e6e8680a9329275c8b687"
@@ -5912,6 +5984,16 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
+nise@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-1.2.0.tgz#079d6cadbbcb12ba30e38f1c999f36ad4d6baa53"
+  dependencies:
+    formatio "^1.2.0"
+    just-extend "^1.1.26"
+    lolex "^1.6.0"
+    path-to-regexp "^1.7.0"
+    text-encoding "^0.6.4"
+
 node-fetch@^1.3.3:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.2.tgz#c54e9aac57e432875233525f3c891c4159ffefd7"
@@ -6449,6 +6531,10 @@ promise-map-series@^0.2.0, promise-map-series@^0.2.1:
   dependencies:
     rsvp "^3.0.14"
 
+promised-io@*:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/promised-io/-/promised-io-0.3.5.tgz#4ad217bb3658bcaae9946b17a8668ecd851e1356"
+
 proxy-addr@~1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918"
@@ -6514,13 +6600,9 @@ quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quic
     rimraf "^2.5.4"
     underscore.string "~3.3.4"
 
-qunit-notifications@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/qunit-notifications/-/qunit-notifications-0.1.1.tgz#3001afc6a6a77dfbd962ccbcddde12dec5286c09"
-
-qunitjs@^2.0.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/qunitjs/-/qunitjs-2.4.0.tgz#58f3a81e846687f2e7f637c5bedc9c267f887261"
+qunit@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.4.1.tgz#373c826b3b91795f3e5479cc94f0f6fa14dedc47"
   dependencies:
     chokidar "1.6.1"
     commander "2.9.0"
@@ -7100,14 +7182,17 @@ simple-is@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0"
 
-sinon@^2.1.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.4.1.tgz#021fd64b54cb77d9d2fb0d43cdedfae7629c3a36"
+sinon@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-3.3.0.tgz#9132111b4bbe13c749c2848210864250165069b1"
   dependencies:
+    build "^0.1.4"
     diff "^3.1.0"
     formatio "1.2.0"
-    lolex "^1.6.0"
+    lodash.get "^4.4.2"
+    lolex "^2.1.2"
     native-promise-only "^0.8.1"
+    nise "^1.0.1"
     path-to-regexp "^1.7.0"
     samsam "^1.1.3"
     text-encoding "0.6.4"
@@ -7285,6 +7370,10 @@ stable@~0.1.3:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.6.tgz#910f5d2aed7b520c6e777499c1f32e139fdecb10"
 
+stack-trace@0.0.x:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+
 staged-git-files@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-0.0.4.tgz#d797e1b551ca7a639dec0237dc6eb4bb9be17d35"
@@ -7560,7 +7649,7 @@ testem@^1.18.0:
     tap-parser "^5.1.0"
     xmldom "^0.1.19"
 
-text-encoding@0.6.4:
+text-encoding@0.6.4, text-encoding@^0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
 
@@ -7589,6 +7678,10 @@ timers-browserify@^1.0.1:
   dependencies:
     process "~0.11.0"
 
+timespan@2.x:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/timespan/-/timespan-2.3.0.tgz#4902ce040bd13d845c8f59b27e9d59bad6f39929"
+
 tiny-lr@^1.0.3:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.0.5.tgz#21f40bf84ebd1f853056680375eef1670c334112"
@@ -7716,6 +7809,10 @@ uglify-es@^3.1.3:
     commander "~2.12.1"
     source-map "~0.6.1"
 
+uglify-js@1.x:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-1.3.5.tgz#4b5bfff9186effbaa888e4c9e94bd9fc4c94929d"
+
 uglify-js@^2.6:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
@@ -7861,7 +7958,7 @@ walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2:
     ensure-posix-path "^1.0.0"
     matcher-collection "^1.0.0"
 
-walker@~1.0.5:
+walker@1.x, walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
   dependencies:
@@ -7917,6 +8014,17 @@ window-size@^0.1.2:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
 
+winston@*:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.0.tgz#808050b93d52661ed9fb6c26b3f0c826708b0aee"
+  dependencies:
+    async "~1.0.0"
+    colors "1.0.x"
+    cycle "1.0.x"
+    eyes "0.1.x"
+    isstream "0.1.x"
+    stack-trace "0.0.x"
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
@@ -7946,6 +8054,10 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
+wrench@1.3.x:
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/wrench/-/wrench-1.3.9.tgz#6f13ec35145317eb292ca5f6531391b244111411"
+
 write-file-atomic@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"

From 7526295e885077e14ea39a5447f34dadaa7bc1f2 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 8 Jan 2018 13:08:14 -0800
Subject: [PATCH 31/48] Use ember-test-selectors for integration tests

---
 .../components/attributes-section.hbs         | 14 +++----
 .../job-diff-fields-and-objects.hbs           | 24 +++++++-----
 ui/app/templates/components/job-diff.hbs      | 36 ++++++++++--------
 ui/app/templates/components/task-log.hbs      | 14 +++----
 ui/tests/integration/attributes-table-test.js | 37 +++++-------------
 ui/tests/integration/job-diff-test.js         | 32 ++++++++++------
 ui/tests/integration/task-log-test.js         | 38 ++++++++++---------
 7 files changed, 100 insertions(+), 95 deletions(-)

diff --git a/ui/app/templates/components/attributes-section.hbs b/ui/app/templates/components/attributes-section.hbs
index dd55bb591..8abeeb135 100644
--- a/ui/app/templates/components/attributes-section.hbs
+++ b/ui/app/templates/components/attributes-section.hbs
@@ -1,18 +1,18 @@
 {{#each-in attributes as |key value|}}
   {{#if (is-object value)}}
-    <tr>
-      <td class="is-subheading" colspan="2">
-        {{#if prefix}}<span class="is-faded">{{prefix}}.</span>{{/if}}{{key}}
+    <tr data-test-attributes-section>
+      <td data-test-heading class="is-subheading" colspan="2">
+        {{#if prefix}}<span class="is-faded" data-test-prefix>{{prefix}}.</span>{{/if}}{{key}}
       </td>
     </tr>
     {{attributes-section prefix=(if prefix (concat prefix '.' key) key) attributes=value}}
   {{else}}
-    <tr>
-      <td>
-        {{#if prefix}}<span class="is-faded">{{prefix}}.</span>{{/if}}
+    <tr data-test-attributes-section>
+      <td data-test-key>
+        {{#if prefix}}<span class="is-faded" data-test-prefix>{{prefix}}.</span>{{/if}}
         {{~key}}
       </td>
-      <td title="{{value}}">{{value}}</td>
+      <td data-test-value title="{{value}}">{{value}}</td>
     </tr>
   {{/if}}
 {{/each-in}}
diff --git a/ui/app/templates/components/job-diff-fields-and-objects.hbs b/ui/app/templates/components/job-diff-fields-and-objects.hbs
index 7da3703c8..dfb51e6e4 100644
--- a/ui/app/templates/components/job-diff-fields-and-objects.hbs
+++ b/ui/app/templates/components/job-diff-fields-and-objects.hbs
@@ -1,9 +1,12 @@
 <div class="diff-section-table">
   {{#each fields as |field|}}
-    <div class="diff-section-table-row {{concat
-      "diff-section-label is-"
-      (lowercase field.Type)
-    }}">
+    <div
+      data-test-diff-section-label="field"
+      data-test-diff-field="{{lowercase field.Type}}"
+      class="diff-section-table-row {{concat
+        "diff-section-label is-"
+        (lowercase field.Type)
+      }}">
       <span class="diff-section-table-cell">
         <span class="marker {{concat "is-" (lowercase field.Type)}}">
           {{#if (eq (lowercase field.Type) "added")}}
@@ -30,10 +33,13 @@
 </div>
 
 {{#each objects as |object|}}
-  <div class="{{concat
-    "diff-section-label is-"
-    (lowercase object.Type)
-  }}">
+  <div
+    data-test-diff-section-label="object"
+    data-test-diff-field="{{lowercase object.Type}}"
+    class="{{concat
+      "diff-section-label is-"
+      (lowercase object.Type)
+    }}">
     <span class="marker {{concat "is-" (lowercase object.Type)}}">
       {{#if (eq (lowercase object.Type) "added")}}
         +
@@ -44,7 +50,7 @@
       {{/if}}
     </span>
     {{object.Name}} {
-      <div class="diff-section-label">
+      <div data-test-diff-section-label="nested-object" class="diff-section-label">
         {{job-diff-fields-and-objects fields=object.Fields objects=object.Objects}}
       </div>
     }
diff --git a/ui/app/templates/components/job-diff.hbs b/ui/app/templates/components/job-diff.hbs
index 7a3311a50..543311238 100644
--- a/ui/app/templates/components/job-diff.hbs
+++ b/ui/app/templates/components/job-diff.hbs
@@ -1,10 +1,13 @@
 {{!-- Job heading --}}
-<div class="{{if diff.Type
-  (concat
-    "diff-section-label is-"
-    (lowercase diff.Type)
-  )
-}}">
+<div
+  data-test-diff-section-label="job"
+  data-test-diff-field="{{lowercase diff.Type}}"
+  class="{{if diff.Type
+    (concat
+      "diff-section-label is-"
+      (lowercase diff.Type)
+    )
+  }}">
   <span class="marker {{concat "is-" (lowercase diff.Type)}}">
     {{#if (eq (lowercase diff.Type) "added")}}
       +
@@ -19,14 +22,14 @@
 
 {{!-- Show job field and object diffs if the job is edited --}}
 {{#if (or verbose (eq (lowercase diff.Type) "edited"))}}
-  <div class="diff-section-label">
+  <div data-test-diff-section-label="job-diff" class="diff-section-label">
     {{job-diff-fields-and-objects fields=diff.Fields objects=diff.Objects}}
   </div>
 {{/if}}
 
 {{!-- Each task group --}}
 {{#each diff.TaskGroups as |group|}}
-  <div class="{{if group.Type
+  <div data-test-diff-section-label="task-group" class="{{if group.Type
     (concat
       "diff-section-label is-"
       (lowercase group.Type)
@@ -50,19 +53,22 @@
 
     {{!-- Show task group field and object diffs if the task group is edited --}}
     {{#if (or (eq (lowercase group.Type) "edited") verbose)}}
-      <div class="diff-section-label">
+      <div data-test-diff-section-label="task-group-diff" class="diff-section-label">
         {{job-diff-fields-and-objects fields=group.Fields objects=group.Objects}}
       </div>
     {{/if}}
 
     {{!-- Each task --}}
     {{#each group.Tasks as |task|}}
-      <div class="{{if task.Type
-        (concat
-          "diff-section-label is-"
-          (lowercase task.Type)
-        )
-      }}">
+      <div
+        data-test-diff-section-label="task"
+        data-test-diff-field="{{lowercase task.Type}}"
+        class="{{if task.Type
+          (concat
+            "diff-section-label is-"
+            (lowercase task.Type)
+          )
+        }}">
       <span class="marker {{concat "is-" (lowercase task.Type)}}">
         {{#if (eq (lowercase task.Type) "added")}}
           +
diff --git a/ui/app/templates/components/task-log.hbs b/ui/app/templates/components/task-log.hbs
index de1fef860..ce0d0ae9c 100644
--- a/ui/app/templates/components/task-log.hbs
+++ b/ui/app/templates/components/task-log.hbs
@@ -1,16 +1,16 @@
 <div class="boxed-section-head">
   <span>
-    <button class="button {{if (eq mode "stdout") "is-info"}} action-stdout" {{action "setMode" "stdout"}}>stdout</button>
-    <button class="button {{if (eq mode "stderr") "is-danger"}} action-stderr" {{action "setMode" "stderr"}}>stderr</button>
+    <button data-test-log-action="stdout" class="button {{if (eq mode "stdout") "is-info"}}" {{action "setMode" "stdout"}}>stdout</button>
+    <button data-test-log-action="stderr" class="button {{if (eq mode "stderr") "is-danger"}}" {{action "setMode" "stderr"}}>stderr</button>
   </span>
   <span class="pull-right">
-    <button class="button is-white action-head" onclick={{perform head}}>Head</button>
-    <button class="button is-white action-tail" onclick={{perform tail}}>Tail</button>
-    <button class="button is-white action-toggle-stream" onclick={{action "toggleStream"}}>
+    <button data-test-log-action="head" class="button is-white" onclick={{perform head}}>Head</button>
+    <button data-test-log-action="tail" class="button is-white" onclick={{perform tail}}>Tail</button>
+    <button data-test-log-action="toggle-stream" class="button is-white" onclick={{action "toggleStream"}}>
       {{x-icon (if logger.isStreaming "media-pause" "media-play") class="is-text"}}
     </button>
   </span>
 </div>
-<div class="boxed-section-body is-dark is-full-bleed">
-  <pre class="cli-window"><code>{{logger.output}}</code></pre>
+<div data-test-log-box class="boxed-section-body is-dark is-full-bleed">
+  <pre data-test-log-cli class="cli-window"><code>{{logger.output}}</code></pre>
 </div>
diff --git a/ui/tests/integration/attributes-table-test.js b/ui/tests/integration/attributes-table-test.js
index 3147ff638..ea0fe99d5 100644
--- a/ui/tests/integration/attributes-table-test.js
+++ b/ui/tests/integration/attributes-table-test.js
@@ -1,4 +1,4 @@
-import { findAll } from 'ember-native-dom-helpers';
+import { find, findAll } from 'ember-native-dom-helpers';
 import { test, moduleForComponent } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 import flat from 'npm:flat';
@@ -32,7 +32,7 @@ test('should render a row for each key/value pair in a deep object', function(as
 
   const rowsCount = Object.keys(flatten(commonAttributes)).length;
   assert.equal(
-    this.$('tbody tr').has('td:eq(1)').length,
+    this.$('[data-test-attributes-section]').has('[data-test-value]').length,
     rowsCount,
     `Table has ${rowsCount} rows with values`
   );
@@ -42,40 +42,21 @@ test('should render the full path of key/value pair from the root of the object'
   this.set('attributes', commonAttributes);
   this.render(hbs`{{attributes-table attributes=attributes}}`);
 
-  assert.equal(
-    this.$('tbody tr:eq(0) td')
-      .get(0)
-      .textContent.trim(),
-    'key',
-    'Simple row renders only the key'
-  );
-  assert.equal(
-    this.$('tbody tr:eq(0) td')
-      .get(1)
-      .textContent.trim(),
-    'value'
-  );
+  assert.equal(find('[data-test-key]').textContent.trim(), 'key', 'Row renders the key');
+  assert.equal(find('[data-test-value]').textContent.trim(), 'value', 'Row renders the value');
 
+  const deepRow = findAll('[data-test-attributes-section]')[8];
   assert.equal(
-    this.$('tbody tr:eq(8) td')
-      .get(0)
-      .textContent.trim(),
+    deepRow.querySelector('[data-test-key]').textContent.trim(),
     'so.are.deeply.nested',
     'Complex row renders the full path to the key'
   );
   assert.equal(
-    this.$('tbody tr:eq(8) td:eq(0) .is-faded')
-      .get(0)
-      .textContent.trim(),
+    deepRow.querySelector('[data-test-prefix]').textContent.trim(),
     'so.are.deeply.',
     'The prefix is faded to put emphasis on the attribute'
   );
-  assert.equal(
-    this.$('tbody tr:eq(8) td')
-      .get(1)
-      .textContent.trim(),
-    'properties'
-  );
+  assert.equal(deepRow.querySelector('[data-test-value]').textContent.trim(), 'properties');
 });
 
 test('should render a row for key/value pairs even when the value is another object', function(
@@ -86,7 +67,7 @@ test('should render a row for key/value pairs even when the value is another obj
 
   const countOfParentRows = countOfParentKeys(commonAttributes);
   assert.equal(
-    findAll('tbody tr td[colspan="2"]').length,
+    findAll('[data-test-heading]').length,
     countOfParentRows,
     'Each key for a nested object gets a row with no value'
   );
diff --git a/ui/tests/integration/job-diff-test.js b/ui/tests/integration/job-diff-test.js
index 087cbbd9f..d1821e452 100644
--- a/ui/tests/integration/job-diff-test.js
+++ b/ui/tests/integration/job-diff-test.js
@@ -29,22 +29,28 @@ test('job field diffs', function(assert) {
   this.render(commonTemplate);
 
   assert.equal(
-    findAll('.diff-section-label').length,
+    findAll('[data-test-diff-section-label]').length,
     5,
     'A section label for each line, plus one for the group'
   );
   assert.equal(
-    cleanWhitespace(find('.diff-section-label .diff-section-label.is-added').textContent),
+    cleanWhitespace(
+      find('[data-test-diff-section-label="field"][data-test-diff-field="added"]').textContent
+    ),
     '+ Added Field: "Foobar"',
     'Added field is rendered correctly'
   );
   assert.equal(
-    cleanWhitespace(find('.diff-section-label .diff-section-label.is-edited').textContent),
+    cleanWhitespace(
+      find('[data-test-diff-section-label="field"][data-test-diff-field="edited"]').textContent
+    ),
     '+/- Edited Field: "256" => "512"',
     'Edited field is rendered correctly'
   );
   assert.equal(
-    cleanWhitespace(find('.diff-section-label .diff-section-label.is-deleted').textContent),
+    cleanWhitespace(
+      find('[data-test-diff-section-label="field"][data-test-diff-field="deleted"]').textContent
+    ),
     '- Removed Field: "12"',
     'Removed field is rendered correctly'
   );
@@ -98,51 +104,53 @@ test('job object diffs', function(assert) {
 
   assert.ok(
     cleanWhitespace(
-      find('.diff-section-label > .diff-section-label.is-added').textContent
+      find('[data-test-diff-section-label="object"][data-test-diff-field="added"]').textContent
     ).startsWith('+ DeepConfiguration {'),
     'Added object starts with a JSON block'
   );
   assert.ok(
     cleanWhitespace(
-      find('.diff-section-label > .diff-section-label.is-edited').textContent
+      find('[data-test-diff-section-label="object"][data-test-diff-field="edited"]').textContent
     ).startsWith('+/- ComplexProperty {'),
     'Edited object starts with a JSON block'
   );
   assert.ok(
     cleanWhitespace(
-      find('.diff-section-label > .diff-section-label.is-deleted').textContent
+      find('[data-test-diff-section-label="object"][data-test-diff-field="deleted"]').textContent
     ).startsWith('- DatedStuff {'),
     'Removed object starts with a JSON block'
   );
 
   assert.ok(
     cleanWhitespace(
-      find('.diff-section-label > .diff-section-label.is-added').textContent
+      find('[data-test-diff-section-label="object"][data-test-diff-field="added"]').textContent
     ).endsWith('}'),
     'Added object ends the JSON block'
   );
   assert.ok(
     cleanWhitespace(
-      find('.diff-section-label > .diff-section-label.is-edited').textContent
+      find('[data-test-diff-section-label="object"][data-test-diff-field="edited"]').textContent
     ).endsWith('}'),
     'Edited object starts with a JSON block'
   );
   assert.ok(
     cleanWhitespace(
-      find('.diff-section-label > .diff-section-label.is-deleted').textContent
+      find('[data-test-diff-section-label="object"][data-test-diff-field="deleted"]').textContent
     ).endsWith('}'),
     'Removed object ends the JSON block'
   );
 
   assert.equal(
-    findAll('.diff-section-label > .diff-section-label.is-added > .diff-section-label').length,
+    findAll(
+      '[data-test-diff-section-label="object"][data-test-diff-field="added"] > [data-test-diff-section-label]'
+    ).length,
     this.get('diff').Objects[1].Objects.length + this.get('diff').Objects[1].Fields.length,
     'Edited block contains each nested field and object'
   );
 
   assert.equal(
     findAll(
-      '.diff-section-label > .diff-section-label.is-added > .diff-section-label > .diff-section-label .diff-section-table-row'
+      '[data-test-diff-section-label="object"][data-test-diff-field="added"] [data-test-diff-section-label="object"] [data-test-diff-section-label="field"]'
     ).length,
     this.get('diff').Objects[1].Objects[0].Fields.length,
     'Objects within objects are rendered'
diff --git a/ui/tests/integration/task-log-test.js b/ui/tests/integration/task-log-test.js
index 7c1999d2c..62f849ae6 100644
--- a/ui/tests/integration/task-log-test.js
+++ b/ui/tests/integration/task-log-test.js
@@ -62,13 +62,13 @@ test('Basic appearance', function(assert) {
   this.setProperties(commonProps);
   this.render(hbs`{{task-log allocation=allocation task=task}}`);
 
-  assert.ok(find('.action-stdout'), 'Stdout button');
-  assert.ok(find('.action-stderr'), 'Stderr button');
-  assert.ok(find('.action-head'), 'Head button');
-  assert.ok(find('.action-tail'), 'Tail button');
-  assert.ok(find('.action-toggle-stream'), 'Stream toggle button');
+  assert.ok(find('[data-test-log-action="stdout"]'), 'Stdout button');
+  assert.ok(find('[data-test-log-action="stderr"]'), 'Stderr button');
+  assert.ok(find('[data-test-log-action="head"]'), 'Head button');
+  assert.ok(find('[data-test-log-action="tail"]'), 'Tail button');
+  assert.ok(find('[data-test-log-action="toggle-stream"]'), 'Stream toggle button');
 
-  assert.ok(find('.boxed-section-body.is-full-bleed.is-dark'), 'Body is full-bleed and dark');
+  assert.ok(find('[data-test-log-box].is-full-bleed.is-dark'), 'Body is full-bleed and dark');
 
   assert.ok(find('pre.cli-window'), 'Cli is preformatted and using the cli-window component class');
 });
@@ -87,7 +87,7 @@ test('Streaming starts on creation', function(assert) {
 
   return wait().then(() => {
     assert.equal(
-      find('.cli-window').textContent,
+      find('[data-test-log-cli]').textContent,
       streamFrames[0],
       'First chunk of streaming log is shown'
     );
@@ -98,7 +98,7 @@ test('Clicking Head loads the log head', function(assert) {
   this.setProperties(commonProps);
   this.render(hbs`{{task-log allocation=allocation task=task}}`);
 
-  click('.action-head');
+  click('[data-test-log-action="head"]');
 
   return wait().then(() => {
     assert.ok(
@@ -107,7 +107,7 @@ test('Clicking Head loads the log head', function(assert) {
       ),
       'Log head request was made'
     );
-    assert.equal(find('.cli-window').textContent, logHead[0], 'Head of the log is shown');
+    assert.equal(find('[data-test-log-cli]').textContent, logHead[0], 'Head of the log is shown');
   });
 });
 
@@ -115,7 +115,7 @@ test('Clicking Tail loads the log tail', function(assert) {
   this.setProperties(commonProps);
   this.render(hbs`{{task-log allocation=allocation task=task}}`);
 
-  click('.action-tail');
+  click('[data-test-log-action="tail"]');
 
   return wait().then(() => {
     assert.ok(
@@ -124,7 +124,7 @@ test('Clicking Tail loads the log tail', function(assert) {
       ),
       'Log tail request was made'
     );
-    assert.equal(find('.cli-window').textContent, logTail[0], 'Tail of the log is shown');
+    assert.equal(find('[data-test-log-cli]').textContent, logTail[0], 'Tail of the log is shown');
   });
 });
 
@@ -134,21 +134,25 @@ test('Clicking toggleStream starts and stops the log stream', function(assert) {
   this.render(hbs`{{task-log allocation=allocation task=task interval=interval}}`);
 
   run.later(() => {
-    click('.action-toggle-stream');
+    click('[data-test-log-action="toggle-stream"]');
   }, interval);
 
   return wait().then(() => {
-    assert.equal(find('.cli-window').textContent, streamFrames[0], 'First frame loaded');
+    assert.equal(find('[data-test-log-cli]').textContent, streamFrames[0], 'First frame loaded');
 
     run.later(() => {
-      assert.equal(find('.cli-window').textContent, streamFrames[0], 'Still only first frame');
-      click('.action-toggle-stream');
+      assert.equal(
+        find('[data-test-log-cli]').textContent,
+        streamFrames[0],
+        'Still only first frame'
+      );
+      click('[data-test-log-action="toggle-stream"]');
       run.later(run, run.cancelTimers, interval * 2);
     }, interval * 2);
 
     return wait().then(() => {
       assert.equal(
-        find('.cli-window').textContent,
+        find('[data-test-log-cli]').textContent,
         streamFrames[0] + streamFrames[0] + streamFrames[1],
         'Now includes second frame'
       );
@@ -160,7 +164,7 @@ test('Clicking stderr switches the log to standard error', function(assert) {
   this.setProperties(commonProps);
   this.render(hbs`{{task-log allocation=allocation task=task}}`);
 
-  click('.action-stderr');
+  click('[data-test-log-action="stderr"]');
   run.later(run, run.cancelTimers, commonProps.interval);
 
   return wait().then(() => {

From e2ffbc0e4cdc0681e951f37d1cde34b3b0b6ef38 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 10 Jan 2018 14:05:57 -0800
Subject: [PATCH 32/48] Add chrome to Travis

---
 .travis.yml  | 3 +++
 ui/testem.js | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3a9791d32..a2c460253 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,9 @@ language: go
 go:
   -  1.9.x
 
+addons:
+  chrome: stable
+
 git:
   depth: 300
 
diff --git a/ui/testem.js b/ui/testem.js
index 630bfd548..919ed563a 100644
--- a/ui/testem.js
+++ b/ui/testem.js
@@ -13,6 +13,7 @@ module.exports = {
       mode: 'ci',
       args: [
         '--headless',
+        '--no-sandbox',
         '--disable-gpu',
         '--remote-debugging-port=9222',
         '--window-size=1440,900',

From 01102b24f71f6212ddb7aafaa52236587d976e63 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 10 Jan 2018 14:06:15 -0800
Subject: [PATCH 33/48] Remove unused ui travis config

---
 ui/.travis.yml | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 ui/.travis.yml

diff --git a/ui/.travis.yml b/ui/.travis.yml
deleted file mode 100644
index 385f003d4..000000000
--- a/ui/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-language: node_js
-node_js:
-  - "6"
-
-sudo: false
-
-cache:
-  directories:
-    - $HOME/.npm
-
-before_install:
-  - npm config set spin false
-  - npm install -g phantomjs-prebuilt
-  - phantomjs --version
-
-install:
-  - npm install
-
-script:
-  - npm test

From de54ba7e36225e728b75b996e3de9da268b1041c Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Thu, 11 Jan 2018 11:32:47 -0800
Subject: [PATCH 34/48] Upgrade stale deps

---
 ui/yarn.lock | 95 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 61 insertions(+), 34 deletions(-)

diff --git a/ui/yarn.lock b/ui/yarn.lock
index cbbce95f5..811d9950c 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -604,6 +604,12 @@ babel-plugin-ember-modules-api-polyfill@^2.0.1:
   dependencies:
     ember-rfc176-data "^0.3.0"
 
+babel-plugin-ember-modules-api-polyfill@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.3.0.tgz#0c01f359658cfb9c797f705af6b09f6220205ae0"
+  dependencies:
+    ember-rfc176-data "^0.3.0"
+
 babel-plugin-eval@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz#a2faed25ce6be69ade4bfec263f70169195950da"
@@ -2428,7 +2434,7 @@ debug@2.6.8, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.4.
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.1, debug@^3.1.0:
+debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
@@ -2688,7 +2694,42 @@ ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7:
     ember-cli-version-checker "^1.0.2"
     resolve "^1.1.2"
 
-ember-cli-babel@^6.0.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.7.2:
+ember-cli-babel@^6.0.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.11.0.tgz#79cb184bac3c05bfe181ddc306bac100ab1f9493"
+  dependencies:
+    amd-name-resolver "0.0.7"
+    babel-plugin-debug-macros "^0.1.11"
+    babel-plugin-ember-modules-api-polyfill "^2.3.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-polyfill "^6.16.0"
+    babel-preset-env "^1.5.1"
+    broccoli-babel-transpiler "^6.1.2"
+    broccoli-debug "^0.6.2"
+    broccoli-funnel "^1.0.0"
+    broccoli-source "^1.1.0"
+    clone "^2.0.0"
+    ember-cli-version-checker "^2.1.0"
+    semver "^5.4.1"
+
+ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9, ember-cli-babel@^6.4.1, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1:
+  version "6.8.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.8.1.tgz#695f94c57a9375c2a0e219306a41105d6b937991"
+  dependencies:
+    amd-name-resolver "0.0.7"
+    babel-plugin-debug-macros "^0.1.11"
+    babel-plugin-ember-modules-api-polyfill "^1.5.1"
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-polyfill "^6.16.0"
+    babel-preset-env "^1.5.1"
+    broccoli-babel-transpiler "^6.1.2"
+    broccoli-debug "^0.6.2"
+    broccoli-funnel "^1.0.0"
+    broccoli-source "^1.1.0"
+    clone "^2.0.0"
+    ember-cli-version-checker "^2.0.0"
+
+ember-cli-babel@^6.10.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.7.2:
   version "6.10.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.10.0.tgz#81424acd1d97fb13658168121eeb2007d6edee84"
   dependencies:
@@ -2706,23 +2747,6 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.3.0, ember-c
     ember-cli-version-checker "^2.1.0"
     semver "^5.4.1"
 
-ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9, ember-cli-babel@^6.1.0, ember-cli-babel@^6.4.1, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1:
-  version "6.8.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.8.1.tgz#695f94c57a9375c2a0e219306a41105d6b937991"
-  dependencies:
-    amd-name-resolver "0.0.7"
-    babel-plugin-debug-macros "^0.1.11"
-    babel-plugin-ember-modules-api-polyfill "^1.5.1"
-    babel-plugin-transform-es2015-modules-amd "^6.24.0"
-    babel-polyfill "^6.16.0"
-    babel-preset-env "^1.5.1"
-    broccoli-babel-transpiler "^6.1.2"
-    broccoli-debug "^0.6.2"
-    broccoli-funnel "^1.0.0"
-    broccoli-source "^1.1.0"
-    clone "^2.0.0"
-    ember-cli-version-checker "^2.0.0"
-
 ember-cli-babel@^6.8.2:
   version "6.9.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.9.0.tgz#5147391389bdbb7091d15f81ae1dff1eb49d71aa"
@@ -2942,13 +2966,12 @@ ember-cli-sass@^6.1.3:
     merge "^1.2.0"
 
 ember-cli-sass@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-7.1.2.tgz#5756a92a526754878b32f3be4367cfe4bf2b5514"
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-7.1.3.tgz#d4a418d68bb513c40270b88576bd2cf07301fdf2"
   dependencies:
     broccoli-funnel "^1.0.0"
     broccoli-merge-trees "^1.1.0"
     broccoli-sass-source-maps "^2.1.0"
-    ember-cli-babel "^6.6.0"
     ember-cli-version-checker "^1.0.2"
 
 ember-cli-shims@^1.2.0:
@@ -3127,11 +3150,11 @@ ember-cli@2.17.1:
     yam "0.0.22"
 
 ember-composable-helpers@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-2.0.3.tgz#9b5e595bf5a45bc4431adfe27821f23b1d534be0"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-2.1.0.tgz#71f75ab2de1c696d21939b5f9dcc62eaf2c947e5"
   dependencies:
     broccoli-funnel "^1.0.1"
-    ember-cli-babel "^6.1.0"
+    ember-cli-babel "^6.6.0"
 
 ember-concurrency@^0.8.12:
   version "0.8.12"
@@ -3200,13 +3223,13 @@ ember-factory-for-polyfill@^1.1.0:
     ember-cli-version-checker "^1.2.0"
 
 ember-fetch@^3.4.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-3.4.3.tgz#fb8ba73148bb2399a82b037e4fdf9a953cd496ba"
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-3.4.4.tgz#926ffa1c4120324b298c44e9558b458e586eb504"
   dependencies:
     broccoli-funnel "^1.2.0"
     broccoli-stew "^1.4.2"
     broccoli-templater "^1.0.0"
-    ember-cli-babel "^6.8.1"
+    ember-cli-babel "^6.8.2"
     node-fetch "^2.0.0-alpha.9"
     whatwg-fetch "^2.0.3"
 
@@ -3627,6 +3650,10 @@ eslint-scope@^3.7.1:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-visitor-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
+
 eslint@^4.0.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.5.0.tgz#bb75d3b8bde97fb5e13efcd539744677feb019c3"
@@ -3670,20 +3697,20 @@ eslint@^4.0.0:
     text-table "~0.2.0"
 
 eslint@^4.13.1:
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.13.1.tgz#0055e0014464c7eb7878caf549ef2941992b444f"
+  version "4.15.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.15.0.tgz#89ab38c12713eec3d13afac14e4a89e75ef08145"
   dependencies:
     ajv "^5.3.0"
     babel-code-frame "^6.22.0"
     chalk "^2.1.0"
     concat-stream "^1.6.0"
     cross-spawn "^5.1.0"
-    debug "^3.0.1"
+    debug "^3.1.0"
     doctrine "^2.0.2"
     eslint-scope "^3.7.1"
+    eslint-visitor-keys "^1.0.0"
     espree "^3.5.2"
     esquery "^1.0.0"
-    estraverse "^4.2.0"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
     functional-red-black-tree "^1.0.1"
@@ -6496,8 +6523,8 @@ pretender@^1.6.1:
     route-recognizer "^0.3.3"
 
 prettier@^1.4.4:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.6.0.tgz#23e9c68251f440feb847f558821bead21765919a"
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
 
 printf@^0.2.3:
   version "0.2.5"

From bd3550ff31d51ec964b4dc782d3b87c87f841718 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Thu, 11 Jan 2018 11:35:30 -0800
Subject: [PATCH 35/48] Upgrade lint-staged

---
 ui/.prettierrc  |   3 +
 ui/package.json |  23 +++---
 ui/yarn.lock    | 205 ++++++++++++++++++++++++++++++++++++------------
 3 files changed, 173 insertions(+), 58 deletions(-)
 create mode 100644 ui/.prettierrc

diff --git a/ui/.prettierrc b/ui/.prettierrc
new file mode 100644
index 000000000..7f9eaa64f
--- /dev/null
+++ b/ui/.prettierrc
@@ -0,0 +1,3 @@
+printWidth: 100
+singleQuote: true
+trailingComma: es5
diff --git a/ui/package.json b/ui/package.json
index db06268b6..a317f7d55 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -14,14 +14,14 @@
     "precommit": "lint-staged"
   },
   "lint-staged": {
-    "gitDir": "../",
-    "linters": {
-      "ui/{app,tests,config,lib,mirage}/**/*.js": [
-        "prettier --single-quote --trailing-comma es5 --print-width 100 --write",
-        "git add"
-      ],
-      "ui/app/styles/**/*.*": ["prettier --write", "git add"]
-    }
+    "ui/{app,tests,config,lib,mirage}/**/*.js": [
+      "prettier --write",
+      "git add"
+    ],
+    "ui/app/styles/**/*.*": [
+      "prettier --write",
+      "git add"
+    ]
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
@@ -69,7 +69,7 @@
     "flat": "^4.0.0",
     "husky": "^0.14.3",
     "json-formatter-js": "^2.2.0",
-    "lint-staged": "^3.6.1",
+    "lint-staged": "^6.0.0",
     "loader.js": "^4.2.3",
     "prettier": "^1.4.4",
     "query-string": "^5.0.0"
@@ -79,6 +79,9 @@
   },
   "private": true,
   "ember-addon": {
-    "paths": ["lib/bulma", "lib/calendar"]
+    "paths": [
+      "lib/bulma",
+      "lib/calendar"
+    ]
   }
 }
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 811d9950c..1eb119057 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -158,7 +158,7 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.0.0, ansi-styles@^3.1.0:
+ansi-styles@^3.0.0, ansi-styles@^3.1.0, ansi-styles@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
   dependencies:
@@ -168,6 +168,10 @@ ansicolors@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
 
+any-observable@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242"
+
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -2077,6 +2081,10 @@ commander@2.9.0, commander@^2.5.0, commander@^2.6.0, commander@^2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
+commander@^2.11.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+
 commander@~2.12.1:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
@@ -2253,18 +2261,14 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-cosmiconfig@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-1.1.0.tgz#0dea0f9804efdfb929fbb1b188e25553ea053d37"
+cosmiconfig@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-3.1.0.tgz#640a94bf9847f321800403cd273af60665c73397"
   dependencies:
-    graceful-fs "^4.1.2"
-    js-yaml "^3.4.3"
-    minimist "^1.2.0"
-    object-assign "^4.0.1"
-    os-homedir "^1.0.1"
-    parse-json "^2.2.0"
-    pinkie-promise "^2.0.0"
-    require-from-string "^1.1.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^3.0.0"
+    require-from-string "^2.0.1"
 
 create-ecdh@^4.0.0:
   version "4.0.0"
@@ -2448,6 +2452,10 @@ decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
 
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+
 deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
@@ -3557,7 +3565,7 @@ entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-error-ex@^1.2.0:
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
@@ -4064,6 +4072,10 @@ find-index@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-1.1.0.tgz#53007c79cd30040d6816d79458e8837d5c5705ef"
 
+find-parent-dir@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -4291,6 +4303,10 @@ get-caller-file@^1.0.0, get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
+get-own-enumerable-property-symbols@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-2.0.1.tgz#5c4ad87f2834c4b9b4e84549dc1e0650fb38c24b"
+
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -4796,6 +4812,10 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.0.0"
 
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
@@ -4814,6 +4834,10 @@ is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
@@ -4840,6 +4864,12 @@ is-glob@^2.0.0, is-glob@^2.0.1:
   dependencies:
     is-extglob "^1.0.0"
 
+is-glob@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-integer@^1.0.4:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-integer/-/is-integer-1.0.7.tgz#6bde81aacddf78b659b6629d629cadc51a886d5c"
@@ -4858,10 +4888,16 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-obj@^1.0.0:
+is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
+is-observable@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
+  dependencies:
+    symbol-observable "^0.2.2"
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -4890,6 +4926,10 @@ is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+
 is-resolvable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
@@ -4952,6 +4992,19 @@ istextorbinary@2.1.0:
     editions "^1.1.1"
     textextensions "1 || 2"
 
+jest-get-type@^21.2.0:
+  version "21.2.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.2.0.tgz#f6376ab9db4b60d81e39f30749c6c466f40d4a23"
+
+jest-validate@^21.1.0:
+  version "21.2.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.2.1.tgz#cc0cbca653cd54937ba4f2a111796774530dd3c7"
+  dependencies:
+    chalk "^2.0.1"
+    jest-get-type "^21.2.0"
+    leven "^2.1.0"
+    pretty-format "^21.2.1"
+
 jquery@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"
@@ -4976,13 +5029,20 @@ js-yaml@0.3.x:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-0.3.7.tgz#d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"
 
-js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.4.3, js-yaml@^3.6.1, js-yaml@^3.9.1:
+js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.6.1, js-yaml@^3.9.1:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^3.9.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 js-yaml@~3.6.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
@@ -5152,6 +5212,10 @@ leven@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/leven/-/leven-1.0.2.tgz#9144b6eebca5f1d0680169f1a6770dcea60b75c3"
 
+leven@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -5171,27 +5235,38 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
-lint-staged@^3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-3.6.1.tgz#24423c8b7bd99d96e15acd1ac8cb392a78e58582"
+lint-staged@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-6.0.0.tgz#7ab7d345f2fe302ff196f1de6a005594ace03210"
   dependencies:
     app-root-path "^2.0.0"
-    cosmiconfig "^1.1.0"
-    execa "^0.7.0"
-    listr "^0.12.0"
-    lodash.chunk "^4.2.0"
+    chalk "^2.1.0"
+    commander "^2.11.0"
+    cosmiconfig "^3.1.0"
+    debug "^3.1.0"
+    dedent "^0.7.0"
+    execa "^0.8.0"
+    find-parent-dir "^0.3.0"
+    is-glob "^4.0.0"
+    jest-validate "^21.1.0"
+    listr "^0.13.0"
+    lodash "^4.17.4"
+    log-symbols "^2.0.0"
     minimatch "^3.0.0"
     npm-which "^3.0.1"
     p-map "^1.1.1"
+    path-is-inside "^1.0.2"
+    pify "^3.0.0"
     staged-git-files "0.0.4"
+    stringify-object "^3.2.0"
 
 listr-silent-renderer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
 
-listr-update-renderer@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz#ca80e1779b4e70266807e8eed1ad6abe398550f9"
+listr-update-renderer@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.4.0.tgz#344d980da2ca2e8b145ba305908f32ae3f4cc8a7"
   dependencies:
     chalk "^1.1.3"
     cli-truncate "^0.2.1"
@@ -5211,25 +5286,26 @@ listr-verbose-renderer@^0.4.0:
     date-fns "^1.27.2"
     figures "^1.7.0"
 
-listr@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.12.0.tgz#6bce2c0f5603fa49580ea17cd6a00cc0e5fa451a"
+listr@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.13.0.tgz#20bb0ba30bae660ee84cc0503df4be3d5623887d"
   dependencies:
     chalk "^1.1.3"
     cli-truncate "^0.2.1"
     figures "^1.7.0"
     indent-string "^2.1.0"
+    is-observable "^0.2.0"
     is-promise "^2.1.0"
     is-stream "^1.1.0"
     listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.2.0"
+    listr-update-renderer "^0.4.0"
     listr-verbose-renderer "^0.4.0"
     log-symbols "^1.0.2"
     log-update "^1.0.2"
     ora "^0.2.3"
     p-map "^1.1.1"
-    rxjs "^5.0.0-beta.11"
-    stream-to-observable "^0.1.0"
+    rxjs "^5.4.2"
+    stream-to-observable "^0.2.0"
     strip-ansi "^3.0.1"
 
 livereload-js@^2.2.2:
@@ -5440,10 +5516,6 @@ lodash.bind@~2.3.0:
     lodash._renative "~2.3.0"
     lodash._slice "~2.3.0"
 
-lodash.chunk@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.chunk/-/lodash.chunk-4.2.0.tgz#66e5ce1f76ed27b4303d8c6512e8d1216e8106bc"
-
 lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.4.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -5662,6 +5734,12 @@ log-symbols@^1.0.2:
   dependencies:
     chalk "^1.0.0"
 
+log-symbols@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.1.0.tgz#f35fa60e278832b538dc4dddcbb478a45d3e3be6"
+  dependencies:
+    chalk "^2.0.1"
+
 log-update@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
@@ -6371,6 +6449,12 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
+parse-json@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-3.0.0.tgz#fa6f47b18e23826ead32f263e744d0e1e847fb13"
+  dependencies:
+    error-ex "^1.3.1"
+
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
@@ -6481,6 +6565,10 @@ pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -6526,6 +6614,13 @@ prettier@^1.4.4:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
 
+pretty-format@^21.2.1:
+  version "21.2.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.2.1.tgz#ae5407f3cf21066cd011aa1ba5fce7b6a2eddb36"
+  dependencies:
+    ansi-regex "^3.0.0"
+    ansi-styles "^3.2.0"
+
 printf@^0.2.3:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/printf/-/printf-0.2.5.tgz#c438ca2ca33e3927671db4ab69c0e52f936a4f0f"
@@ -6912,9 +7007,9 @@ require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
-require-from-string@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+require-from-string@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.1.tgz#c545233e9d7da6616e9d59adfb39fc9f588676ff"
 
 require-main-filename@^1.0.1:
   version "1.0.1"
@@ -7051,11 +7146,11 @@ rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-rxjs@^5.0.0-beta.11:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.3.tgz#0758cddee6033d68e0fd53676f0f3596ce3d483f"
+rxjs@^5.4.2:
+  version "5.5.6"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02"
   dependencies:
-    symbol-observable "^1.0.1"
+    symbol-observable "1.0.1"
 
 safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
@@ -7446,9 +7541,11 @@ stream-splicer@^2.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
-stream-to-observable@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.1.0.tgz#45bf1d9f2d7dc09bed81f1c307c430e68b84cffe"
+stream-to-observable@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10"
+  dependencies:
+    any-observable "^0.2.0"
 
 strict-uri-encode@^1.0.0:
   version "1.1.0"
@@ -7483,6 +7580,14 @@ string_decoder@~1.0.3:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-object@^3.2.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.1.tgz#2720c2eff940854c819f6ee252aaeb581f30624d"
+  dependencies:
+    get-own-enumerable-property-symbols "^2.0.1"
+    is-obj "^1.0.1"
+    is-regexp "^1.0.0"
+
 stringmap@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/stringmap/-/stringmap-0.2.2.tgz#556c137b258f942b8776f5b2ef582aa069d7d1b1"
@@ -7583,9 +7688,13 @@ svgo@^0.6.3:
     sax "~1.2.1"
     whet.extend "~0.9.9"
 
-symbol-observable@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
+symbol-observable@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
+
+symbol-observable@^0.2.2:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
 
 symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8:
   version "1.1.8"

From 856b01148bfc147d22b6ca2bb2a8fd7740c8bd52 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Thu, 11 Jan 2018 11:37:54 -0800
Subject: [PATCH 36/48] Run prettier on all files

Since prettier updated, some files have out of date formatting.
---
 ui/app/styles/charts/colors.scss           |  6 ++--
 ui/app/styles/charts/distribution-bar.scss |  3 +-
 ui/app/styles/charts/tooltip.scss          |  4 +--
 ui/app/styles/components/json-viewer.scss  | 10 +++---
 ui/app/styles/components/timeline.scss     |  4 +--
 ui/app/styles/components/tooltip.scss      |  2 +-
 ui/app/styles/core/forms.scss              | 10 ++++--
 ui/app/styles/core/navbar.scss             |  8 ++---
 ui/app/styles/core/table.scss              |  8 ++---
 ui/app/styles/core/variables.scss          |  4 +--
 ui/app/styles/utils/product-colors.scss    | 20 ++++++------
 ui/config/targets.js                       |  7 +----
 ui/mirage/factories/client-stats.js        | 36 ++++++++++++----------
 ui/mirage/serializers/application.js       |  8 ++++-
 14 files changed, 70 insertions(+), 60 deletions(-)

diff --git a/ui/app/styles/charts/colors.scss b/ui/app/styles/charts/colors.scss
index 4f3c6335f..e204c723f 100644
--- a/ui/app/styles/charts/colors.scss
+++ b/ui/app/styles/charts/colors.scss
@@ -10,7 +10,8 @@ $lost: $dark;
     fill: $queued;
   }
 
-  .starting, .pending {
+  .starting,
+  .pending {
     .layer-0 {
       fill: $starting;
     }
@@ -58,7 +59,8 @@ $lost: $dark;
     background: $queued;
   }
 
-  &.starting, &.pending {
+  &.starting,
+  &.pending {
     background: repeating-linear-gradient(
       -45deg,
       $starting,
diff --git a/ui/app/styles/charts/distribution-bar.scss b/ui/app/styles/charts/distribution-bar.scss
index a59c041fb..fcd4a7824 100644
--- a/ui/app/styles/charts/distribution-bar.scss
+++ b/ui/app/styles/charts/distribution-bar.scss
@@ -21,8 +21,7 @@
         opacity: 0;
       }
 
-      $color-sequence: $orange, $yellow, $green, $turquoise, $blue, $purple,
-        $red;
+      $color-sequence: $orange, $yellow, $green, $turquoise, $blue, $purple, $red;
 
       @for $i from 1 through length($color-sequence) {
         .slice-#{$i - 1} {
diff --git a/ui/app/styles/charts/tooltip.scss b/ui/app/styles/charts/tooltip.scss
index c8e17f908..580e0ab3b 100644
--- a/ui/app/styles/charts/tooltip.scss
+++ b/ui/app/styles/charts/tooltip.scss
@@ -18,7 +18,7 @@
     &::before {
       pointer-events: none;
       display: inline-block;
-      content: "";
+      content: '';
       width: 0;
       height: 0;
       border-top: 7px solid $grey;
@@ -34,7 +34,7 @@
     &::after {
       pointer-events: none;
       display: inline-block;
-      content: "";
+      content: '';
       width: 0;
       height: 0;
       border-top: 6px solid $white;
diff --git a/ui/app/styles/components/json-viewer.scss b/ui/app/styles/components/json-viewer.scss
index dd215bc97..4c6b1431f 100644
--- a/ui/app/styles/components/json-viewer.scss
+++ b/ui/app/styles/components/json-viewer.scss
@@ -13,7 +13,9 @@
   $url-color: blue
 ) {
   font-family: monospace;
-  &, a, a:hover {
+  &,
+  a,
+  a:hover {
     color: $default-color;
     text-decoration: none;
   }
@@ -31,10 +33,10 @@
         display: none;
       }
       &.json-formatter-object:after {
-        content: "No properties";
+        content: 'No properties';
       }
       &.json-formatter-array:after {
-        content: "[]";
+        content: '[]';
       }
     }
   }
@@ -100,7 +102,7 @@
   // Inline preview on hover (optional)
   > a > .json-formatter-preview-text {
     opacity: 0;
-    transition: opacity .15s ease-in;
+    transition: opacity 0.15s ease-in;
     font-style: italic;
   }
 
diff --git a/ui/app/styles/components/timeline.scss b/ui/app/styles/components/timeline.scss
index bc3ab077a..553257c6c 100644
--- a/ui/app/styles/components/timeline.scss
+++ b/ui/app/styles/components/timeline.scss
@@ -4,7 +4,7 @@
   z-index: $z-base;
 
   &::before {
-    content: " ";
+    content: ' ';
     position: absolute;
     display: block;
     top: 0;
@@ -32,7 +32,7 @@
     }
 
     &::before {
-      content: " ";
+      content: ' ';
       position: absolute;
       display: block;
       width: 10px;
diff --git a/ui/app/styles/components/tooltip.scss b/ui/app/styles/components/tooltip.scss
index bcb851033..68842c133 100644
--- a/ui/app/styles/components/tooltip.scss
+++ b/ui/app/styles/components/tooltip.scss
@@ -31,7 +31,7 @@
   pointer-events: none;
   display: block;
   opacity: 0;
-  content: "";
+  content: '';
   width: 0;
   height: 0;
   border-top: 6px solid $black;
diff --git a/ui/app/styles/core/forms.scss b/ui/app/styles/core/forms.scss
index 741dd892e..19ad29950 100644
--- a/ui/app/styles/core/forms.scss
+++ b/ui/app/styles/core/forms.scss
@@ -4,7 +4,12 @@
   border-color: $grey-blue;
   color: $text;
 
-  &:hover, &.is-hovered, &:active, &.is-active, &:focus, &.is-focused {
+  &:hover,
+  &.is-hovered,
+  &:active,
+  &.is-active,
+  &:focus,
+  &.is-focused {
     border-color: darken($grey-blue, 5%);
   }
 
@@ -14,7 +19,8 @@
   }
 }
 
-.input, .textarea {
+.input,
+.textarea {
   @include input;
   box-shadow: none;
   padding: 0.75em 1.5em;
diff --git a/ui/app/styles/core/navbar.scss b/ui/app/styles/core/navbar.scss
index 9d5929e15..39232665d 100644
--- a/ui/app/styles/core/navbar.scss
+++ b/ui/app/styles/core/navbar.scss
@@ -1,10 +1,6 @@
 .navbar {
   &.is-primary {
-    background: linear-gradient(
-      to right,
-      $nomad-green-darker,
-      $nomad-green-dark
-    );
+    background: linear-gradient(to right, $nomad-green-darker, $nomad-green-dark);
     height: 3.5rem;
     color: $primary-invert;
     padding-left: 20px;
@@ -32,7 +28,7 @@
           width: 1px;
           height: 1em;
           background: rgba($primary-invert, 0.5);
-          content: " ";
+          content: ' ';
           display: block;
           position: absolute;
           left: 0px;
diff --git a/ui/app/styles/core/table.scss b/ui/app/styles/core/table.scss
index e1c14d6ee..ecfacdd86 100644
--- a/ui/app/styles/core/table.scss
+++ b/ui/app/styles/core/table.scss
@@ -147,7 +147,7 @@
         position: relative;
 
         &::after {
-          content: "";
+          content: '';
           width: 10px;
           right: 1.5em;
           top: 0.75em;
@@ -157,11 +157,11 @@
         }
 
         &.asc::after {
-          content: "⬇";
+          content: '⬇';
         }
 
         &.desc::after {
-          content: "⬆";
+          content: '⬆';
         }
       }
 
@@ -186,7 +186,7 @@
 
           &::after {
             position: absolute;
-            content: "";
+            content: '';
             width: 3px;
             top: 0;
             bottom: 0;
diff --git a/ui/app/styles/core/variables.scss b/ui/app/styles/core/variables.scss
index 641706168..bef639661 100644
--- a/ui/app/styles/core/variables.scss
+++ b/ui/app/styles/core/variables.scss
@@ -22,8 +22,8 @@ $size-7: 0.85rem;
 
 $title-weight: $weight-semibold;
 
-$family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-  Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+$family-sans-serif: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu,
+  Cantarell, 'Helvetica Neue', sans-serif;
 
 $text: $black;
 
diff --git a/ui/app/styles/utils/product-colors.scss b/ui/app/styles/utils/product-colors.scss
index 689b9e84e..bbf4b63aa 100644
--- a/ui/app/styles/utils/product-colors.scss
+++ b/ui/app/styles/utils/product-colors.scss
@@ -1,15 +1,15 @@
-$consul-pink: #FF0087;
-$consul-pink-dark: #C62A71;
+$consul-pink: #ff0087;
+$consul-pink-dark: #c62a71;
 
-$packer-blue: #1DAEFF;
-$packer-blue-dark: #1D94DD;
+$packer-blue: #1daeff;
+$packer-blue-dark: #1d94dd;
 
-$terraform-purple: #5C4EE5;
-$terraform-purple-dark: #4040B2;
+$terraform-purple: #5c4ee5;
+$terraform-purple-dark: #4040b2;
 
-$vagrant-blue: #1563FF;
-$vagrant-blue-dark: #104EB2;
+$vagrant-blue: #1563ff;
+$vagrant-blue-dark: #104eb2;
 
-$nomad-green: #25BA81;
+$nomad-green: #25ba81;
 $nomad-green-dark: #1d9467;
-$nomad-green-darker: #16704D;
+$nomad-green-darker: #16704d;
diff --git a/ui/config/targets.js b/ui/config/targets.js
index 2bebfacad..547445947 100644
--- a/ui/config/targets.js
+++ b/ui/config/targets.js
@@ -1,10 +1,5 @@
 /* eslint-env node */
 
 module.exports = {
-  browsers: [
-    'ie 9',
-    'last 1 Chrome versions',
-    'last 1 Firefox versions',
-    'last 1 Safari versions'
-  ]
+  browsers: ['ie 9', 'last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'],
 };
diff --git a/ui/mirage/factories/client-stats.js b/ui/mirage/factories/client-stats.js
index 8b8b4e13f..6924f07f6 100644
--- a/ui/mirage/factories/client-stats.js
+++ b/ui/mirage/factories/client-stats.js
@@ -12,27 +12,31 @@ export default Factory.extend({
   }),
 
   CPU: () => [
-    Array(faker.list.random(1, 2, 4, 6, 8, 12, 16, 24, 32)).fill(0).map((cpu, index) => ({
-      CPU: `cpu${index}`,
-      Idle: 20,
-      System: 40,
-      Total: 80,
-      User: 40,
-    })),
+    Array(faker.list.random(1, 2, 4, 6, 8, 12, 16, 24, 32))
+      .fill(0)
+      .map((cpu, index) => ({
+        CPU: `cpu${index}`,
+        Idle: 20,
+        System: 40,
+        Total: 80,
+        User: 40,
+      })),
   ],
 
   CPUTicksConsumed: 1000000,
 
   diskStats: () => [
-    Array(faker.random.number({ min: 1, max: 5 })).fill(0).map((disk, index) => ({
-      Available: 100000000000,
-      Device: `/dev/disk${index}`,
-      InodesUsedPercent: 0.10000000001,
-      Mountpoint: '/',
-      Size: 2000000000000,
-      Used: 1000000000000,
-      UsedPercent: 50.0,
-    })),
+    Array(faker.random.number({ min: 1, max: 5 }))
+      .fill(0)
+      .map((disk, index) => ({
+        Available: 100000000000,
+        Device: `/dev/disk${index}`,
+        InodesUsedPercent: 0.10000000001,
+        Mountpoint: '/',
+        Size: 2000000000000,
+        Used: 1000000000000,
+        UsedPercent: 50.0,
+      })),
   ],
 
   memory: () => ({
diff --git a/ui/mirage/serializers/application.js b/ui/mirage/serializers/application.js
index 5bee3867e..6957d8991 100644
--- a/ui/mirage/serializers/application.js
+++ b/ui/mirage/serializers/application.js
@@ -1,6 +1,12 @@
 import { RestSerializer } from 'ember-cli-mirage';
 
-const keyCase = str => (str === 'id' ? 'ID' : str.camelize().capitalize().replace(/Id/g, 'ID'));
+const keyCase = str =>
+  str === 'id'
+    ? 'ID'
+    : str
+        .camelize()
+        .capitalize()
+        .replace(/Id/g, 'ID');
 
 export default RestSerializer.extend({
   serialize() {

From 4605d95f39b461af0a1335484c107cdce62b3e96 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 16 Jan 2018 16:02:59 -0800
Subject: [PATCH 37/48] Update the ember-freestyle dep

---
 ui/package.json |  2 +-
 ui/yarn.lock    | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index a317f7d55..914d94ad2 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -53,7 +53,7 @@
     "ember-data-model-fragments": "^2.14.0",
     "ember-export-application-global": "^2.0.0",
     "ember-fetch": "^3.4.3",
-    "ember-freestyle": "^0.4.1",
+    "ember-freestyle": "~0.6.2",
     "ember-inline-svg": "^0.1.11",
     "ember-load-initializers": "^1.0.0",
     "ember-moment": "^7.5.0",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 1eb119057..31ac06177 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -3241,24 +3241,20 @@ ember-fetch@^3.4.3:
     node-fetch "^2.0.0-alpha.9"
     whatwg-fetch "^2.0.3"
 
-ember-freestyle@^0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/ember-freestyle/-/ember-freestyle-0.4.2.tgz#ae1593be2106e4212b319e5474a3f9432fa4e329"
+ember-freestyle@~0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/ember-freestyle/-/ember-freestyle-0.6.2.tgz#c325f96a32b4984b78e00cbd29e6dad23f0b1864"
   dependencies:
     broccoli-flatiron "0.0.0"
-    broccoli-funnel "^1.0.1"
     broccoli-merge-trees "^2.0.0"
-    broccoli-source "^1.1.0"
-    broccoli-stew "^1.2.0"
     broccoli-writer "^0.1.1"
-    ember-cli-babel "^6.0.0"
+    ember-cli-babel "^6.6.0"
     ember-cli-htmlbars "^1.3.0"
     ember-cli-sass "^6.1.3"
     ember-cli-showdown "^3.2.1"
     ember-runtime-enumerable-includes-polyfill "^2.0.0"
     es6-promise "^4.1.0"
     glob "^7.1.1"
-    highlight.js "^9.3.0"
 
 ember-get-config@^0.2.2:
   version "0.2.4"
@@ -4560,10 +4556,6 @@ heimdalljs@^0.3.0:
   dependencies:
     rsvp "~3.2.1"
 
-highlight.js@^9.3.0:
-  version "9.12.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
-
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"

From f8e563ba7119826d1845f79fa30a3f80100afe7b Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 16 Jan 2018 16:03:50 -0800
Subject: [PATCH 38/48] A new place to put styles only the styleguide uses

---
 ui/app/styles/app.scss        | 11 +++++----
 ui/app/styles/styleguide.scss | 44 +++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 ui/app/styles/styleguide.scss

diff --git a/ui/app/styles/app.scss b/ui/app/styles/app.scss
index 444a30182..952709aee 100644
--- a/ui/app/styles/app.scss
+++ b/ui/app/styles/app.scss
@@ -1,5 +1,8 @@
-@import "./core";
-@import "./components";
-@import "./charts";
+@import './core';
+@import './components';
+@import './charts';
 
-@import "ember-power-select";
+@import 'ember-power-select';
+
+// Only necessary in dev
+@import './styleguide.scss';
diff --git a/ui/app/styles/styleguide.scss b/ui/app/styles/styleguide.scss
new file mode 100644
index 000000000..f77df0655
--- /dev/null
+++ b/ui/app/styles/styleguide.scss
@@ -0,0 +1,44 @@
+#styleguide {
+  .mock-content {
+    display: flex;
+    height: 250px;
+
+    .mock-image,
+    .mock-copy {
+      height: 100%;
+      width: 100%;
+      margin: 1em;
+    }
+
+    .mock-image {
+      background: linear-gradient(
+          to top right,
+          transparent 0%,
+          transparent 49%,
+          $grey-blue 49%,
+          $grey-blue 51%,
+          transparent 51%,
+          transparent 100%
+        ),
+        linear-gradient(
+          to bottom right,
+          transparent 0%,
+          transparent 49%,
+          $grey-blue 49%,
+          $grey-blue 51%,
+          transparent 51%,
+          transparent 100%
+        );
+    }
+
+    .mock-copy {
+      background: repeating-linear-gradient(
+        to bottom,
+        $grey-blue,
+        $grey-blue 5px,
+        transparent 5px,
+        transparent 14px
+      );
+    }
+  }
+}

From cff01570d613d213dd5016484f79c67b1ff8a305 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 16 Jan 2018 16:04:43 -0800
Subject: [PATCH 39/48] Fix a class name bug in the distribution bar

---
 ui/app/components/distribution-bar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/components/distribution-bar.js b/ui/app/components/distribution-bar.js
index 8c171b11b..46d47d8f4 100644
--- a/ui/app/components/distribution-bar.js
+++ b/ui/app/components/distribution-bar.js
@@ -99,7 +99,7 @@ export default Component.extend(WindowResizable, {
       });
 
     slices = slices.merge(slicesEnter);
-    slices.attr('class', d => d.className || `slice-${filteredData.indexOf(d)}`);
+    slices.attr('class', d => d.className || `slice-${_data.indexOf(d)}`);
 
     const setWidth = d => `${width * d.percent - (d.index === sliceCount - 1 || d.index === 0 ? 1 : 2)}px`
     const setOffset = d => `${width * d.offset + (d.index === 0 ? 0 : 1)}px`

From 44b8f97d39ba86dc13680544fe752322e8b12143 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 16 Jan 2018 16:05:15 -0800
Subject: [PATCH 40/48] Fix syntax highlighting in the styleguide

---
 ui/app/routes/freestyle.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 ui/app/routes/freestyle.js

diff --git a/ui/app/routes/freestyle.js b/ui/app/routes/freestyle.js
new file mode 100644
index 000000000..21534ffe7
--- /dev/null
+++ b/ui/app/routes/freestyle.js
@@ -0,0 +1,18 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import RSVP from 'rsvp';
+
+export default Route.extend({
+  emberFreestyle: service(),
+
+  beforeModel() {
+    let emberFreestyle = this.get('emberFreestyle');
+
+    return emberFreestyle.ensureHljs().then(() => {
+      return RSVP.all([
+        emberFreestyle.ensureHljsLanguage('handlebars'),
+        emberFreestyle.ensureHljsLanguage('htmlbars'),
+      ]);
+    });
+  },
+});

From 78d167125344bd763c9616f7f925279d368fed0e Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 16 Jan 2018 16:09:51 -0800
Subject: [PATCH 41/48] Move button styleguide material to a component

---
 .../components/freestyle/sg-buttons.hbs       | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 ui/app/templates/components/freestyle/sg-buttons.hbs

diff --git a/ui/app/templates/components/freestyle/sg-buttons.hbs b/ui/app/templates/components/freestyle/sg-buttons.hbs
new file mode 100644
index 000000000..069427c59
--- /dev/null
+++ b/ui/app/templates/components/freestyle/sg-buttons.hbs
@@ -0,0 +1,54 @@
+{{#freestyle-collection defaultKey="standard" as |collection|}}
+  {{#collection.variant key="standard"}}
+    {{#freestyle-usage 'buttons-standard' title='Standard Buttons'}}
+      <div class="block">
+        <a class="button">Button</a>
+        <a class="button is-white">White</a>
+        <a class="button is-light">Light</a>
+        <a class="button is-dark">Dark</a>
+        <a class="button is-black">Black</a>
+        <a class="button is-link">Link</a>
+      </div>
+      <div class="block">
+        <a class="button is-primary">Primary</a>
+        <a class="button is-info">Info</a>
+        <a class="button is-success">Success</a>
+        <a class="button is-warning">Warning</a>
+        <a class="button is-danger">Danger</a>
+      </div>
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="outlines"}}
+    {{#freestyle-usage 'buttons-outlines' title='Outline Buttons'}}
+      <div class="block">
+        <a class="button is-outlined">Outlined</a>
+        <a class="button is-primary is-outlined">Primary</a>
+        <a class="button is-info is-outlined">Info</a>
+        <a class="button is-success is-outlined">Success</a>
+        <a class="button is-warning is-outlined">Warning</a>
+        <a class="button is-danger is-outlined is-important">Danger</a>
+      </div>
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="hollow"}}
+    {{#freestyle-usage 'buttons-hollow' title='Hollow Buttons'}}
+      <div class="block" style="background:#25BA81; padding:30px">
+        <a class="button is-primary is-inverted is-outlined">Primary</a>
+        <a class="button is-info is-inverted is-outlined">Info</a>
+        <a class="button is-success is-inverted is-outlined">Success</a>
+        <a class="button is-warning is-inverted is-outlined">Warning</a>
+        <a class="button is-danger is-inverted is-outlined">Danger</a>
+      </div>
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="sizing"}}
+    {{#freestyle-usage 'buttons-sizing' title='Button Sizes'}}
+      <div class="block">
+        <a class="button is-small">Small</a>
+        <a class="button">Normal</a>
+        <a class="button is-medium">Medium</a>
+        <a class="button is-large">Large</a>
+      </div>
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+{{/freestyle-collection}}

From 62dbb27365b24b49abb694ddf3fb1599a1c41dc2 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 16 Jan 2018 16:10:32 -0800
Subject: [PATCH 42/48] Move distribution bar styleguide material to a
 component

---
 .../freestyle/sg-distribution-bar.js          | 43 ++++++++++++
 .../freestyle/sg-distribution-bar.hbs         | 70 +++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 ui/app/components/freestyle/sg-distribution-bar.js
 create mode 100644 ui/app/templates/components/freestyle/sg-distribution-bar.hbs

diff --git a/ui/app/components/freestyle/sg-distribution-bar.js b/ui/app/components/freestyle/sg-distribution-bar.js
new file mode 100644
index 000000000..ab43ceb03
--- /dev/null
+++ b/ui/app/components/freestyle/sg-distribution-bar.js
@@ -0,0 +1,43 @@
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+
+export default Component.extend({
+  timerTicks: 0,
+
+  startTimer: function() {
+    this.set(
+      'timer',
+      setInterval(() => {
+        this.incrementProperty('timerTicks');
+      }, 500)
+    );
+  }.on('init'),
+
+  willDestroy() {
+    clearInterval(this.get('timer'));
+  },
+
+  distributionBarData: computed(() => {
+    return [
+      { label: 'one', value: 10 },
+      { label: 'two', value: 20 },
+      { label: 'three', value: 30 },
+    ];
+  }),
+
+  distributionBarDataWithClasses: computed(() => {
+    return [
+      { label: 'Queued', value: 10, className: 'queued' },
+      { label: 'Complete', value: 20, className: 'complete' },
+      { label: 'Failed', value: 30, className: 'failed' },
+    ];
+  }),
+
+  distributionBarDataRotating: computed('timerTicks', () => {
+    return [
+      { label: 'one', value: Math.round(Math.random() * 50) },
+      { label: 'two', value: Math.round(Math.random() * 50) },
+      { label: 'three', value: Math.round(Math.random() * 50) },
+    ];
+  }),
+});
diff --git a/ui/app/templates/components/freestyle/sg-distribution-bar.hbs b/ui/app/templates/components/freestyle/sg-distribution-bar.hbs
new file mode 100644
index 000000000..3fbc6d993
--- /dev/null
+++ b/ui/app/templates/components/freestyle/sg-distribution-bar.hbs
@@ -0,0 +1,70 @@
+{{#freestyle-collection as |collection|}}
+  {{#collection.variant key="standard"}}
+    {{#freestyle-usage 'distribution-bar-standard'}}
+      <div class="block" style="height:50px; width:200px;">
+        {{distribution-bar data=distributionBarData}}
+      </div>
+    {{/freestyle-usage}}
+    {{#freestyle-annotation}}
+      <div class="block">
+        The distribution bar chart proportionally show data in a single bar. It includes a tooltip out of the box, assumes the size of the container element, and is designed to be styled with CSS.
+      </div>
+      <div class="boxed-section">
+        <div class="boxed-section-body is-dark">
+          {{json-viewer json=distributionBarData}}
+        </div>
+      </div>
+    {{/freestyle-annotation}}
+  {{/collection.variant}}
+  {{#collection.variant key="with classes"}}
+    {{#freestyle-usage 'distribution-bar-with-classes'}}
+      <div class="block" style="height:50px; width:200px;">
+        {{distribution-bar data=distributionBarDataWithClasses}}
+      </div>
+    {{/freestyle-usage}}
+    {{#freestyle-annotation}}
+      <div class="block">
+        If a datum provides a <code>className</code> property, it will be assigned to the corresponding <code>rect</code> element, allowing for custom colorization.
+      </div>
+      <div class="boxed-section">
+        <div class="boxed-section-body is-dark">
+          {{json-viewer json=distributionBarDataWithClasses}}
+        </div>
+      </div>
+    {{/freestyle-annotation}}
+  {{/collection.variant}}
+  {{#collection.variant key="flexibility"}}
+    {{#freestyle-usage 'distribution-bar-sizing-1'}}
+      <div class="block" style="height:10px; width:600px;">
+        {{distribution-bar data=distributionBarData}}
+      </div>
+    {{/freestyle-usage}}
+    {{#freestyle-usage 'distribution-bar-sizing-2'}}
+      <div class="block" style="height:200px; width:30px;">
+        {{distribution-bar data=distributionBarData}}
+      </div>
+    {{/freestyle-usage}}
+    {{#freestyle-annotation}}
+      <div class="block">
+      Distribution bar assumes the dimensions of the container.
+      </div>
+    {{/freestyle-annotation}}
+  {{/collection.variant}}
+  {{#collection.variant key="live updating"}}
+    {{#freestyle-usage 'distribution-bar-updating'}}
+      <div class="block" style="height:50px; width:600px;">
+        {{distribution-bar data=distributionBarDataRotating}}
+      </div>
+    {{/freestyle-usage}}
+    {{#freestyle-annotation}}
+      <div class="block">
+      Distribution bar animates with data changes.
+      </div>
+      <div class="boxed-section">
+        <div class="boxed-section-body is-dark">
+          {{json-viewer json=distributionBarDataRotating}}
+        </div>
+      </div>
+    {{/freestyle-annotation}}
+  {{/collection.variant}}
+{{/freestyle-collection}}

From a6e8007d06deebd7b2c5f0d4acbb772131a2aa1d Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 16 Jan 2018 16:11:34 -0800
Subject: [PATCH 43/48] Add jumbo distribution bar to the styleguide

---
 .../freestyle/sg-distribution-bar-jumbo.js    | 13 ++++++++++
 .../freestyle/sg-distribution-bar-jumbo.hbs   | 25 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 ui/app/components/freestyle/sg-distribution-bar-jumbo.js
 create mode 100644 ui/app/templates/components/freestyle/sg-distribution-bar-jumbo.hbs

diff --git a/ui/app/components/freestyle/sg-distribution-bar-jumbo.js b/ui/app/components/freestyle/sg-distribution-bar-jumbo.js
new file mode 100644
index 000000000..9176d6b7c
--- /dev/null
+++ b/ui/app/components/freestyle/sg-distribution-bar-jumbo.js
@@ -0,0 +1,13 @@
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+
+export default Component.extend({
+  distributionBarData: computed(() => {
+    return [
+      { label: 'one', value: 10 },
+      { label: 'two', value: 20 },
+      { label: 'three', value: 0 },
+      { label: 'four', value: 35 },
+    ];
+  }),
+});
diff --git a/ui/app/templates/components/freestyle/sg-distribution-bar-jumbo.hbs b/ui/app/templates/components/freestyle/sg-distribution-bar-jumbo.hbs
new file mode 100644
index 000000000..924f3ed7d
--- /dev/null
+++ b/ui/app/templates/components/freestyle/sg-distribution-bar-jumbo.hbs
@@ -0,0 +1,25 @@
+{{#freestyle-usage "jumbo-distribution-bar"}}
+  {{#distribution-bar data=distributionBarData class="split-view" as |chart|}}
+    <ol class="legend">
+      {{#each chart.data as |datum index|}}
+        <li class="{{datum.className}} {{if (eq datum.index chart.activeDatum.index) "is-active"}} {{if (eq datum.value 0) "is-empty"}}">
+          <span class="color-swatch {{if datum.className datum.className (concat "swatch-" index)}}" />
+          <span class="value" data-test-legend-value="{{datum.className}}">{{datum.value}}</span>
+          <span class="label">
+            {{datum.label}}
+          </span>
+        </li>
+      {{/each}}
+    </ol>
+  {{/distribution-bar}}
+{{/freestyle-usage}}
+{{#freestyle-annotation}}
+  <div class="block">
+    A variation of the Distribution Bar component for when the distribution bar is the central component of the page. It's a larger format that requires no interaction to see the data labels and values.
+  </div>
+  <div class="boxed-section">
+    <div class="boxed-section-body is-dark">
+      {{json-viewer json=distributionBarData}}
+    </div>
+  </div>
+{{/freestyle-annotation}}

From ab6c443edfc414099f3de4f71a28b3653599f430 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 16 Jan 2018 16:12:23 -0800
Subject: [PATCH 44/48] Add basic elements to the styleguide

---
 ui/app/components/freestyle/sg-colors.js      | 97 +++++++++++++++++++
 .../components/freestyle/sg-colors.hbs        | 16 +++
 .../components/freestyle/sg-font-sizing.hbs   | 14 +++
 .../components/freestyle/sg-font-stacks.hbs   | 52 ++++++++++
 4 files changed, 179 insertions(+)
 create mode 100644 ui/app/components/freestyle/sg-colors.js
 create mode 100644 ui/app/templates/components/freestyle/sg-colors.hbs
 create mode 100644 ui/app/templates/components/freestyle/sg-font-sizing.hbs
 create mode 100644 ui/app/templates/components/freestyle/sg-font-stacks.hbs

diff --git a/ui/app/components/freestyle/sg-colors.js b/ui/app/components/freestyle/sg-colors.js
new file mode 100644
index 000000000..40d77fcd2
--- /dev/null
+++ b/ui/app/components/freestyle/sg-colors.js
@@ -0,0 +1,97 @@
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+
+export default Component.extend({
+  nomadTheme: computed(() => [
+    {
+      name: 'Primary',
+      base: '#25ba81',
+    },
+    {
+      name: 'Primary Dark',
+      base: '#1d9467',
+    },
+    {
+      name: 'Text',
+      base: '#0a0a0a',
+    },
+    {
+      name: 'Link',
+      base: '#1563ff',
+    },
+    {
+      name: 'Gray',
+      base: '#bbc4d1',
+    },
+    {
+      name: 'Off-white',
+      base: '#f5f5f5',
+    },
+  ]),
+
+  productColors: computed(() => [
+    {
+      name: 'Consul Pink',
+      base: '#ff0087',
+    },
+    {
+      name: 'Consul Pink Dark',
+      base: '#c62a71',
+    },
+    {
+      name: 'Packer Blue',
+      base: '#1daeff',
+    },
+    {
+      name: 'Packer Blue Dark',
+      base: '#1d94dd',
+    },
+    {
+      name: 'Terraform Purple',
+      base: '#5c4ee5',
+    },
+    {
+      name: 'Terraform Purple Dark',
+      base: '#4040b2',
+    },
+    {
+      name: 'Vagrant Blue',
+      base: '#1563ff',
+    },
+    {
+      name: 'Vagrant Blue Dark',
+      base: '#104eb2',
+    },
+    {
+      name: 'Nomad Green',
+      base: '#25ba81',
+    },
+    {
+      name: 'Nomad Green Dark',
+      base: '#1d9467',
+    },
+    {
+      name: 'Nomad Green Darker',
+      base: '#16704d',
+    },
+  ]),
+
+  emotiveColors: computed(() => [
+    {
+      name: 'Success',
+      base: '#23d160',
+    },
+    {
+      name: 'Warning',
+      base: '#fa8e23',
+    },
+    {
+      name: 'Danger',
+      base: '#c84034',
+    },
+    {
+      name: 'Info',
+      base: '#1563ff',
+    },
+  ]),
+});
diff --git a/ui/app/templates/components/freestyle/sg-colors.hbs b/ui/app/templates/components/freestyle/sg-colors.hbs
new file mode 100644
index 000000000..b0f69844f
--- /dev/null
+++ b/ui/app/templates/components/freestyle/sg-colors.hbs
@@ -0,0 +1,16 @@
+{{#freestyle-usage "colors"}}
+  {{freestyle-palette
+      colorPalette=nomadTheme
+      title="Nomad Theme"
+      description="Accent and neutrals."}}
+
+  {{freestyle-palette
+      colorPalette=productColors
+      title="Product Colors"
+      description="Colors from other HashiCorp products. Often borrowed for alternative accents and color schemes."}}
+
+  {{freestyle-palette
+      colorPalette=emotiveColors
+      title="Emotive Colors"
+      description="Colors used in conjunction with an emotional response."}}
+{{/freestyle-usage}}
diff --git a/ui/app/templates/components/freestyle/sg-font-sizing.hbs b/ui/app/templates/components/freestyle/sg-font-sizing.hbs
new file mode 100644
index 000000000..02b3b38c0
--- /dev/null
+++ b/ui/app/templates/components/freestyle/sg-font-sizing.hbs
@@ -0,0 +1,14 @@
+{{#freestyle-usage "font-sizing"}}
+  <div class="block">
+    <h1 class="title">Large Title</h1>
+    <p>Some prose to follow the large title. Not necessarily meant for reading.</p>
+  </div>
+  <div class="block">
+    <h2 class="title is-4">Medium Title</h2>
+    <p>Some prose to follow the large title. Not necessarily meant for reading.</p>
+  </div>
+  <div class="block">
+    <h3 class="title is-5">Small Title</h3>
+    <p>Some prose to follow the large title. Not necessarily meant for reading.</p>
+  </div>
+{{/freestyle-usage}}
diff --git a/ui/app/templates/components/freestyle/sg-font-stacks.hbs b/ui/app/templates/components/freestyle/sg-font-stacks.hbs
new file mode 100644
index 000000000..9b8dfb2e6
--- /dev/null
+++ b/ui/app/templates/components/freestyle/sg-font-stacks.hbs
@@ -0,0 +1,52 @@
+{{#freestyle-collection inline=true as |collection|}}
+  {{#collection.variant key="-apple-system"}}
+    {{#freestyle-usage "font-apple-system" title="-apple-system"}}
+      {{freestyle-typeface fontFamily="-apple-system"}}
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="BlinkMacSystemFont"}}
+    {{#freestyle-usage "font-blink-mac-system" title="BlinkMacSystemFont"}}
+      {{freestyle-typeface fontFamily="BlinkMacSystemFont"}}
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="Segoe UI"}}
+    {{#freestyle-usage "font-segoe-ui" title="Segoe UI"}}
+      {{freestyle-typeface fontFamily="Segoe UI"}}
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="Roboto"}}
+    {{#freestyle-usage "font-roboto" title="Roboto"}}
+      {{freestyle-typeface fontFamily="Roboto"}}
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="Oxygen Sans"}}
+    {{#freestyle-usage "font-oxygen-sans" title="Oxygen Sans"}}
+      {{freestyle-typeface fontFamily="Oxygen-Sans"}}
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="Ubuntu"}}
+    {{#freestyle-usage "font-ubuntu" title="Ubuntu"}}
+      {{freestyle-typeface fontFamily="Ubuntu"}}
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="Cantarell"}}
+    {{#freestyle-usage "font-cantarell" title="Cantarell"}}
+      {{freestyle-typeface fontFamily="Cantarell"}}
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="Helvetica Neue"}}
+    {{#freestyle-usage "font-helvetica-neue" title="Helvetica Neue"}}
+      {{freestyle-typeface fontFamily="Helvetica Neue"}}
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="sans-serif"}}
+    {{#freestyle-usage "font-sans-serif" title="sans-serif"}}
+      {{freestyle-typeface fontFamily="sans-serif"}}
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="monospace"}}
+    {{#freestyle-usage "font-monospace" title="monospace"}}
+      {{freestyle-typeface fontFamily="monospace"}}
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+{{/freestyle-collection}}

From 89118a0505605da4e02766f546a193b1c085a87b Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 16 Jan 2018 16:13:32 -0800
Subject: [PATCH 45/48] Add boxed-section component to the styleguide

---
 .../components/freestyle/sg-boxed-section.js  |  27 +++
 .../components/freestyle/sg-boxed-section.hbs | 183 ++++++++++++++++++
 2 files changed, 210 insertions(+)
 create mode 100644 ui/app/components/freestyle/sg-boxed-section.js
 create mode 100644 ui/app/templates/components/freestyle/sg-boxed-section.hbs

diff --git a/ui/app/components/freestyle/sg-boxed-section.js b/ui/app/components/freestyle/sg-boxed-section.js
new file mode 100644
index 000000000..4e4f4fa7d
--- /dev/null
+++ b/ui/app/components/freestyle/sg-boxed-section.js
@@ -0,0 +1,27 @@
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+
+export default Component.extend({
+  variants: computed(() => [
+    {
+      key: 'Normal',
+      title: 'Normal',
+      slug: '',
+    },
+    {
+      key: 'Info',
+      title: 'Info',
+      slug: 'is-info',
+    },
+    {
+      key: 'Warning',
+      title: 'Warning',
+      slug: 'is-warning',
+    },
+    {
+      key: 'Danger',
+      title: 'Danger',
+      slug: 'is-danger',
+    },
+  ]),
+});
diff --git a/ui/app/templates/components/freestyle/sg-boxed-section.hbs b/ui/app/templates/components/freestyle/sg-boxed-section.hbs
new file mode 100644
index 000000000..52b39c823
--- /dev/null
+++ b/ui/app/templates/components/freestyle/sg-boxed-section.hbs
@@ -0,0 +1,183 @@
+{{#freestyle-collection defaultKey="Normal" as |collection|}}
+  {{#collection.variant key="Normal"}}
+    {{#freestyle-usage "boxed-section-normal-normal" title="Normal Boxed Section"}}
+      <div class="boxed-section">
+        <div class="boxed-section-head">
+          Normal Boxed Section
+        </div>
+        <div class="boxed-section-body">
+          <div class="mock-content">
+            <div class="mock-image"></div>
+            <div class="mock-copy"></div>
+            <div class="mock-copy"></div>
+          </div>
+        </div>
+      </div>
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="Info"}}
+    {{#freestyle-usage "boxed-section-normal-info" title="Info Boxed Section"}}
+      <div class="boxed-section is-info">
+        <div class="boxed-section-head">
+          Normal Boxed Section
+        </div>
+        <div class="boxed-section-body">
+          <div class="mock-content">
+            <div class="mock-image"></div>
+            <div class="mock-copy"></div>
+            <div class="mock-copy"></div>
+          </div>
+        </div>
+      </div>
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="Warning"}}
+    {{#freestyle-usage "boxed-section-normal-warning" title="Warning Boxed Section"}}
+      <div class="boxed-section is-warning">
+        <div class="boxed-section-head">
+          Normal Boxed Section
+        </div>
+        <div class="boxed-section-body">
+          <div class="mock-content">
+            <div class="mock-image"></div>
+            <div class="mock-copy"></div>
+            <div class="mock-copy"></div>
+          </div>
+        </div>
+      </div>
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+  {{#collection.variant key="Danger"}}
+    {{#freestyle-usage "boxed-section-normal-danger" title="Danger Boxed Section"}}
+      <div class="boxed-section is-danger">
+        <div class="boxed-section-head">
+          Normal Boxed Section
+        </div>
+        <div class="boxed-section-body">
+          <div class="mock-content">
+            <div class="mock-image"></div>
+            <div class="mock-copy"></div>
+            <div class="mock-copy"></div>
+          </div>
+        </div>
+      </div>
+    {{/freestyle-usage}}
+  {{/collection.variant}}
+{{/freestyle-collection}}
+
+{{#freestyle-collection defaultKey="Normal" as |collection|}}
+  {{#each variants as |variant|}}
+    {{#collection.variant key=variant.key}}
+      {{#freestyle-usage "boxed-section-right-hand-normal" title=(concat variant.title "Normal Boxed Section With Right Hand Details")}}
+        <div class="boxed-section {{variant.slug}}">
+          <div class="boxed-section-head">
+            Boxed Section With Right Hand Details
+            <span class="pull-right">{{now interval=1000}}</span>
+          </div>
+          <div class="boxed-section-body">
+            <div class="mock-content">
+              <div class="mock-image"></div>
+              <div class="mock-copy"></div>
+              <div class="mock-copy"></div>
+            </div>
+          </div>
+        </div>
+      {{/freestyle-usage}}
+    {{/collection.variant}}
+  {{/each}}
+{{/freestyle-collection}}
+
+{{#freestyle-collection defaultKey="Normal" as |collection|}}
+  {{#each variants as |variant|}}
+    {{#collection.variant key=variant.key}}
+      {{#freestyle-usage "boxed-section-left-badge-normal" title=(concat variant.title " Normal Boxed Section With Title Decoration")}}
+        <div class="boxed-section {{variant.slug}}">
+          <div class="boxed-section-head">
+            Boxed Section With Title Decoration
+            <span class="badge is-white">7</span>
+          </div>
+          <div class="boxed-section-body">
+            <div class="mock-content">
+              <div class="mock-image"></div>
+              <div class="mock-copy"></div>
+              <div class="mock-copy"></div>
+            </div>
+          </div>
+        </div>
+      {{/freestyle-usage}}
+    {{/collection.variant}}
+  {{/each}}
+{{/freestyle-collection}}
+
+{{#freestyle-collection defaultKey="Normal" as |collection|}}
+  {{#each variants as |variant|}}
+    {{#collection.variant key=variant.key}}
+      {{#freestyle-usage "boxed-section-with-foot-normal" title=(concat variant.title " Boxed Section With Foot")}}
+        <div class="boxed-section {{variant.slug}}">
+          <div class="boxed-section-head">
+            Boxed Section With Large Header
+          </div>
+          <div class="boxed-section-body with-foot">
+            <div class="mock-content">
+              <div class="mock-image"></div>
+              <div class="mock-copy"></div>
+              <div class="mock-copy"></div>
+            </div>
+          </div>
+          <div class="boxed-section-foot">
+            <span>Left-aligned message</span>
+            <a href="#" class="pull-right">Toggle or other action</a>
+          </div>
+        </div>
+      {{/freestyle-usage}}
+    {{/collection.variant}}
+  {{/each}}
+{{/freestyle-collection}}
+
+{{#freestyle-collection defaultKey="Normal" as |collection|}}
+  {{#each variants as |variant|}}
+    {{#collection.variant key=variant.key}}
+      {{#freestyle-usage "boxed-section-with-large-header" title=(concat variant.title " Boxed Section With Large Header")}}
+        <div class="boxed-section {{variant.slug}}">
+          <div class="boxed-section-head">
+            <div class="boxed-section-row">
+              Boxed Section With Large Header
+              <span class="badge is-white is-subtle bumper-left">Status</span>
+            </div>
+            <div class="boxed-section-row">
+              <span class="tag is-outlined">A tag that goes on a second line because it's rather long</span>
+            </div>
+          </div>
+          <div class="boxed-section-body">
+            <div class="mock-content">
+              <div class="mock-image"></div>
+              <div class="mock-copy"></div>
+              <div class="mock-copy"></div>
+            </div>
+          </div>
+        </div>
+      {{/freestyle-usage}}
+    {{/collection.variant}}
+  {{/each}}
+{{/freestyle-collection}}
+
+{{#freestyle-collection defaultKey="Normal" as |collection|}}
+  {{#each variants as |variant|}}
+    {{#collection.variant key=variant.key}}
+      {{#freestyle-usage "boxed-section-with-dark-body" title=(concat variant.title " Boxed Section With Dark Body")}}
+        <div class="boxed-section {{variant.slug}}">
+          <div class="boxed-section-head">
+            Boxed Section With Dark Body
+          </div>
+          <div class="boxed-section-body is-dark">
+            <div class="mock-content">
+              <div class="mock-image"></div>
+              <div class="mock-copy"></div>
+              <div class="mock-copy"></div>
+            </div>
+          </div>
+        </div>
+      {{/freestyle-usage}}
+    {{/collection.variant}}
+  {{/each}}
+{{/freestyle-collection}}

From c8fcb4c710377186809721aac3395c9e4b123c8a Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 16 Jan 2018 16:13:47 -0800
Subject: [PATCH 46/48] Reorganize the styleguide using components for sections

---
 ui/app/controllers/freestyle.js    |  40 -------
 ui/app/services/ember-freestyle.js |   2 +-
 ui/app/templates/freestyle.hbs     | 176 +++++++++++------------------
 3 files changed, 64 insertions(+), 154 deletions(-)

diff --git a/ui/app/controllers/freestyle.js b/ui/app/controllers/freestyle.js
index 552795608..a5809f613 100644
--- a/ui/app/controllers/freestyle.js
+++ b/ui/app/controllers/freestyle.js
@@ -1,46 +1,6 @@
 import { inject as service } from '@ember/service';
-import { computed } from '@ember/object';
 import FreestyleController from 'ember-freestyle/controllers/freestyle';
 
 export default FreestyleController.extend({
   emberFreestyle: service(),
-
-  timerTicks: 0,
-
-  startTimer: function() {
-    this.set(
-      'timer',
-      setInterval(() => {
-        this.incrementProperty('timerTicks');
-      }, 500)
-    );
-  }.on('init'),
-
-  stopTimer: function() {
-    clearInterval(this.get('timer'));
-  }.on('willDestroy'),
-
-  distributionBarData: computed(() => {
-    return [
-      { label: 'one', value: 10 },
-      { label: 'two', value: 20 },
-      { label: 'three', value: 30 },
-    ];
-  }),
-
-  distributionBarDataWithClasses: computed(() => {
-    return [
-      { label: 'Queued', value: 10, className: 'queued' },
-      { label: 'Complete', value: 20, className: 'complete' },
-      { label: 'Failed', value: 30, className: 'failed' },
-    ];
-  }),
-
-  distributionBarDataRotating: computed('timerTicks', () => {
-    return [
-      { label: 'one', value: Math.round(Math.random() * 50) },
-      { label: 'two', value: Math.round(Math.random() * 50) },
-      { label: 'three', value: Math.round(Math.random() * 50) },
-    ];
-  }),
 });
diff --git a/ui/app/services/ember-freestyle.js b/ui/app/services/ember-freestyle.js
index fa276c8d9..a30217765 100644
--- a/ui/app/services/ember-freestyle.js
+++ b/ui/app/services/ember-freestyle.js
@@ -1,5 +1,5 @@
 import EmberFreestyle from 'ember-freestyle/services/ember-freestyle';
 
 export default EmberFreestyle.extend({
-  defaultTheme: 'monokai-sublime',
+  defaultTheme: 'solarized-light',
 });
diff --git a/ui/app/templates/freestyle.hbs b/ui/app/templates/freestyle.hbs
index 18f8a0ae1..62103f9c8 100644
--- a/ui/app/templates/freestyle.hbs
+++ b/ui/app/templates/freestyle.hbs
@@ -1,120 +1,70 @@
 <div id="styleguide">
-  {{#freestyle-guide title='Nomad UI'subtitle='Styles and Patterns'}}
-    {{#freestyle-section name='Buttons' as |section|}}
-      {{#freestyle-subsection name='Standard' section=section}}
-        {{#freestyle-usage 'buttons-standard' title='Standard Buttons'}}
-          <div class="block">
-            <a class="button">Button</a>
-            <a class="button is-white">White</a>
-            <a class="button is-light">Light</a>
-            <a class="button is-dark">Dark</a>
-            <a class="button is-black">Black</a>
-            <a class="button is-link">Link</a>
-          </div>
-          <div class="block">
-            <a class="button is-primary">Primary</a>
-            <a class="button is-info">Info</a>
-            <a class="button is-success">Success</a>
-            <a class="button is-warning">Warning</a>
-            <a class="button is-danger">Danger</a>
-          </div>
-        {{/freestyle-usage}}
-      {{/freestyle-subsection}}
+  {{#freestyle-guide title='Nomad UI' subtitle='Styles and Patterns'}}
+    {{#freestyle-section name="Theme" as |section|}}
+      {{#section.subsection name="Font Stacks"}}
+        {{freestyle/sg-font-stacks}}
+      {{/section.subsection}}
 
-      {{#freestyle-subsection name='Outlines' section=section}}
-        {{#freestyle-usage 'buttons-outlines' title='Outline Buttons'}}
-          <div class="block">
-            <a class="button is-outlined">Outlined</a>
-            <a class="button is-primary is-outlined">Primary</a>
-            <a class="button is-info is-outlined">Info</a>
-            <a class="button is-success is-outlined">Success</a>
-            <a class="button is-warning is-outlined">Warning</a>
-            <a class="button is-danger is-outlined is-important">Danger</a>
-          </div>
-        {{/freestyle-usage}}
-      {{/freestyle-subsection}}
+      {{#section.subsection name="Text Sizing"}}
+        {{freestyle/sg-font-sizing}}
+      {{/section.subsection}}
 
-      {{#freestyle-subsection name='Hollow' section=section}}
-        {{#freestyle-usage 'buttons-hollow' title='Hollow Buttons'}}
-          <div class="block" style="background:#25BA81; padding:30px">
-            <a class="button is-primary is-inverted is-outlined">Primary</a>
-            <a class="button is-info is-inverted is-outlined">Info</a>
-            <a class="button is-success is-inverted is-outlined">Success</a>
-            <a class="button is-warning is-inverted is-outlined">Warning</a>
-            <a class="button is-danger is-inverted is-outlined">Danger</a>
-          </div>
-        {{/freestyle-usage}}
-      {{/freestyle-subsection}}
-
-      {{#freestyle-subsection name='Sizing' section=section}}
-        {{#freestyle-usage 'buttons-sizing' title='Button Sizes'}}
-          <div class="block">
-            <a class="button is-small">Small</a>
-            <a class="button">Normal</a>
-            <a class="button is-medium">Medium</a>
-            <a class="button is-large">Large</a>
-          </div>
-        {{/freestyle-usage}}
-      {{/freestyle-subsection}}
+      {{#section.subsection name="Colors"}}
+        {{freestyle/sg-colors}}
+      {{/section.subsection}}
     {{/freestyle-section}}
 
-    {{#freestyle-section name='Distribution Bar' as |section|}}
-      {{#freestyle-subsection name='Standard' section=section}}
-        {{#freestyle-usage 'distribution-bar-standard'}}
-          <div class="block" style="height:50px; width:200px;">
-            {{distribution-bar data=distributionBarData}}
-          </div>
-        {{/freestyle-usage}}
-        {{#freestyle-annotation}}
-          <div class="block">
-            The distribution bar chart proportionally show data in a single bar. It includes a tooltip out of the box, assumes the size of the container element, and is designed to be styled with CSS.
-          </div>
-        {{/freestyle-annotation}}
-      {{/freestyle-subsection}}
-
-      {{#freestyle-subsection name='With Classes' section=section}}
-        {{#freestyle-usage 'distribution-bar-with-classes'}}
-          <div class="block" style="height:50px; width:200px;">
-            {{distribution-bar data=distributionBarDataWithClasses}}
-          </div>
-        {{/freestyle-usage}}
-        {{#freestyle-annotation}}
-          <div class="block">
-            If a datum provides a <code>className</code> property, it will be assigned to the corresponding <code>rect</code> element, allowing for custom colorization.
-          </div>
-        {{/freestyle-annotation}}
-      {{/freestyle-subsection}}
-
-      {{#freestyle-subsection name='Flexible Sizing' section=section}}
-        {{#freestyle-usage 'distribution-bar-sizing-1'}}
-          <div class="block" style="height:10px; width:600px;">
-            {{distribution-bar data=distributionBarData}}
-          </div>
-        {{/freestyle-usage}}
-        {{#freestyle-usage 'distribution-bar-sizing-2'}}
-          <div class="block" style="height:200px; width:30px;">
-            {{distribution-bar data=distributionBarData}}
-          </div>
-        {{/freestyle-usage}}
-        {{#freestyle-annotation}}
-          <div class="block">
-          Distribution bar assumes the dimensions of the container.
-          </div>
-        {{/freestyle-annotation}}
-      {{/freestyle-subsection}}
-
-      {{#freestyle-subsection name='Updating Data' section=section}}
-        {{#freestyle-usage 'distribution-bar-updating'}}
-          <div class="block" style="height:50px; width:600px;">
-            {{distribution-bar data=distributionBarDataRotating}}
-          </div>
-        {{/freestyle-usage}}
-        {{#freestyle-annotation}}
-          <div class="block">
-          Distribution bar animates with data changes.
-          </div>
-        {{/freestyle-annotation}}
-      {{/freestyle-subsection}}
+    {{#freestyle-section name="Components" as |section|}}
+      {{#section.subsection name="Boxed section"}}
+        {{freestyle/sg-boxed-section}}
+      {{/section.subsection}}
+      {{#section.subsection name="Breadcrumbs"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Buttons"}}
+        {{freestyle/sg-buttons}}
+      {{/section.subsection}}
+      {{#section.subsection name="Diff Viewer"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Dropdown"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Event stream"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Gutter navigation"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Header"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Inline definitions"}}
+      {{/section.subsection}}
+      {{#section.subsection name="JSON Viewer"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Log Stream"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Metric"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Page tabs"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Page title"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Search box"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Table"}}
+      {{/section.subsection}}
+      {{#section.subsection name="Table, Configuration"}}
+      {{/section.subsection}}
     {{/freestyle-section}}
-{{/freestyle-guide}}
+
+    {{#freestyle-section name="Charts" as |section|}}
+      {{#section.subsection name="Distribution Bar"}}
+        {{freestyle/sg-distribution-bar}}
+      {{/section.subsection}}
+
+      {{#section.subsection name="Jumbo Distribution Bar"}}
+        {{freestyle/sg-distribution-bar-jumbo}}
+      {{/section.subsection}}
+
+      {{#section.subsection name="Progress Bar"}}
+      {{/section.subsection}}
+    {{/freestyle-section}}
+  {{/freestyle-guide}}
 </div>
+

From 249fe6fd94a641790b2e2e93dedaa6ff91770f14 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 16 Jan 2018 17:04:59 -0800
Subject: [PATCH 47/48] Add breadcrumbs to the styleguide

---
 .../components/freestyle/sg-breadcrumbs.hbs   | 33 +++++++++++++++++++
 ui/app/templates/freestyle.hbs                |  4 +++
 2 files changed, 37 insertions(+)
 create mode 100644 ui/app/templates/components/freestyle/sg-breadcrumbs.hbs

diff --git a/ui/app/templates/components/freestyle/sg-breadcrumbs.hbs b/ui/app/templates/components/freestyle/sg-breadcrumbs.hbs
new file mode 100644
index 000000000..8ad173adf
--- /dev/null
+++ b/ui/app/templates/components/freestyle/sg-breadcrumbs.hbs
@@ -0,0 +1,33 @@
+{{#freestyle-usage 'breadcrumbs-standard' title='Standard Breadcrumbs'}}
+  <div class="navbar is-secondary">
+    <div class="navbar-item"></div>
+    <nav class="breadcrumb is-large">
+      <li>
+        <a href="#">Topic</a>
+      </li>
+      <li>
+        <a href="#">Sub-topic</a>
+      </li>
+      <li class="is-active">
+        <a href="#">Active Topic</a>
+      </li>
+    </nav>
+  </div>
+{{/freestyle-usage}}
+{{#freestyle-annotation}}
+  Breadcrumbs are only ever used in the secondary nav of the primary header.
+{{/freestyle-annotation}}
+
+{{#freestyle-usage 'breadcrumbs-single' title='Single Breadcrumb'}}
+  <div class="navbar is-secondary">
+    <div class="navbar-item"></div>
+    <nav class="breadcrumb is-large">
+      <li>
+        <a href="#">Topic</a>
+      </li>
+    </nav>
+  </div>
+{{/freestyle-usage}}
+{{#freestyle-annotation}}
+  Breadcrumbs are given a lot of emphasis and often double as a page title. Since they are also global state, they are important for helping a user keep their bearings.
+{{/freestyle-annotation}}
diff --git a/ui/app/templates/freestyle.hbs b/ui/app/templates/freestyle.hbs
index 62103f9c8..a1398fcf0 100644
--- a/ui/app/templates/freestyle.hbs
+++ b/ui/app/templates/freestyle.hbs
@@ -18,11 +18,15 @@
       {{#section.subsection name="Boxed section"}}
         {{freestyle/sg-boxed-section}}
       {{/section.subsection}}
+
       {{#section.subsection name="Breadcrumbs"}}
+        {{freestyle/sg-breadcrumbs}}
       {{/section.subsection}}
+
       {{#section.subsection name="Buttons"}}
         {{freestyle/sg-buttons}}
       {{/section.subsection}}
+
       {{#section.subsection name="Diff Viewer"}}
       {{/section.subsection}}
       {{#section.subsection name="Dropdown"}}

From 11f5e4be689aa6153f8ce50857d1749980c0baff Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 17 Jan 2018 09:00:27 -0800
Subject: [PATCH 48/48] Use Node 8

---
 ui/.nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/.nvmrc b/ui/.nvmrc
index 1e8b31496..45a4fb75d 100644
--- a/ui/.nvmrc
+++ b/ui/.nvmrc
@@ -1 +1 @@
-6
+8