Merge branch 'master' into fix

README.md

@@ -3,8 +3,6 @@ Rancher UI
 
 Perhaps you like managing Cattle.
 
-[![Build Status](https://drone.rancher.io/api/badges/rancher/ui/status.svg)](https://drone.rancher.io/rancher/ui)
-
 ## Usage
 
 Prerequisites:
@@ -69,9 +67,10 @@ Rancher UI supports localization via translations files. You can swap translatio
 If you want to customize the UI, re-packaging all of Rancher to distribute the UI is possible but not terribly convenient. Instead you can change Cattle to load the UI source from a remote web server:
 
 - Build with `./scripts/build-static -l -c 'your-server.com'`
-- Upload `./dist/static/latest` so that it's available at http://your-server.com/latest (you can rename the "latest" part with the `-v` flag)
-- If your Rancher is behind a SSL proxy, your-server must also respond to SSL requests
-- Change the value of http[s]://your-rancher:8080/v1/settings/api.ui.index to `//yourserver.com/latest`
+- Upload `./dist/static/latest2` so that it's available at https://your-server.com/latest2
+  - It must be available over HTTPS.
+  - You can rename the "latest2" part with the `-v` flag
+- Change the value of http[s]://your-rancher:8080/v3/settings/ui-index to the same `https://yourserver.com/latest2` URL
 
 ### Running Tests
 
@@ -98,7 +97,7 @@ Or just [click here](//github.com/rancher/rancher/issues/new?title=%5BUI%5D%20)
 
 License
 =======
-Copyright (c) 2014-2016 [Rancher Labs, Inc.](http://rancher.com)
+Copyright (c) 2014-2018 [Rancher Labs, Inc.](http://rancher.com)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

app/update-password/route.js

@@ -25,7 +25,7 @@ export default Route.extend({
       const version = get(this, `settings.${ C.SETTING.VERSION_RANCHER }`);
       let optIn;
 
-      if ( version && version !== 'master' ) {
+      if ( version && !['dev', 'master'].includes(version) ) {
         // For releases, default to opt in
         optIn = (cur !== 'out');
       } else {

lib/shared/addon/access/service.js

@@ -86,7 +86,7 @@ export default Service.extend({
       return this.loadMe();
     }).catch((err) => {
       next(() => {
-        set(this, 'app.initError', err);
+        set(this, 'app.initError', ( err && err.message ) ? err : { message: 'No response received' } );
       });
       set(this, 'providers', []);
     });

lib/shared/addon/components/cru-cluster/component.js

@@ -193,6 +193,13 @@ export default Component.extend(ViewNewEdit, ChildHook, {
     }
   }),
 
+  doSave(opt) {
+    opt = opt || {};
+    opt.qp = { '_replace': 'true' };
+
+    return this._super(opt);
+  },
+
   didSave() {
     const originalCluster = get(this, 'cluster');
 

package.json

@@ -29,7 +29,7 @@
     "card": "2.4.0",
     "d3": "3.5.17",
     "dotenv": "^4.0.0",
-    "ember-api-store": "2.6.12",
+    "ember-api-store": "2.6.13",
     "ember-assign-helper": "^0.1.2",
     "ember-basic-dropdown": "^1.0.0",
     "ember-browserify": "^1.2.0",

translations/en-us.yaml

@@ -2876,7 +2876,7 @@ dangerZone:
     'engine-install-url': 'Default Docker engine installation URL (for most node drivers)'
     'engine-iso-url': 'Default OS installation URL (for vSphere driver)'
     'engine-newest-version': 'The newest supported version of Docker at the time of this release.  A Docker version that does not satisfy supported docker range but is newer than this will be marked as untested'
-    'engine-supported-range': 'Semver range for suported Docker engine versions.  Versions which do not satisfy this range will be marked unsupported in the UI'
+    'engine-supported-range': 'Semver range for supported Docker engine versions.  Versions which do not satisfy this range will be marked unsupported in the UI'
     'ingress-ip-domain': 'Wildcard DNS domain to use for automatically generated Ingress hostnames. <ingress-name>.<namespace-name>.<ip address of ingress controller> will be added to the domain.'
     'server-url': 'Default {appName} install url. Must be HTTPS. All nodes in your cluster must be able to reach this.'
     'system-default-registry': 'Private registry to be used for all system Docker images'

yarn.lock

@@ -2604,9 +2604,9 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
-ember-api-store@2.6.12:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/ember-api-store/-/ember-api-store-2.6.12.tgz#c60638ecc53af22c128bfd710e171c098c7483db"
+ember-api-store@2.6.13:
+  version "2.6.13"
+  resolved "https://registry.yarnpkg.com/ember-api-store/-/ember-api-store-2.6.13.tgz#49b0a8bbd4741619651f3e28999814d199352a11"
   dependencies:
     broccoli-file-creator "^1.1.1"
     ember-cli-babel "^6.8.2"
@@ -8551,4 +8551,4 @@ yargs@~3.10.0:
 
 yeast@0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"