Merge remote-tracking branch 'mist-ce/staging' into staging

mistio · Jul 26, 2019 · 115966e · 115966e
2 parents 0f5244c + bf0c97b
commit 115966e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,6 @@
 * Bugfix: Fix volume actions & attachment info update in UI
 * Bugfix: Fix volume parsing in DigitalOcean and OpenStack
 * Bugfix: Fix detach_volume in OpenStack driver
-* Bugfix: Dont throw exception when landing content page is unreachable
 
 ## v4.1.0 (21 May 2019)
 

diff --git a/api b/api
diff --git a/chart/mist/templates/ingress.yaml b/chart/mist/templates/ingress.yaml
@@ -8,8 +8,8 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    kubernetes.io/ingress.class: nginx
 {{- if .Values.http.tlsSecret }}
-    ingress.kubernetes.io/ssl-redirect: "true"
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     {{- if .Values.http.http2 }}
     nginx.ingress.kubernetes.io/ssl-passthrough: "true"
@@ -39,4 +39,3 @@ spec:
       - backend:
           serviceName: {{ include "chart.fullname" . }}-nginx
           servicePort: 80
-        path: /*
diff --git a/landing b/landing
diff --git a/ui b/ui
+13 −12		src/mist/api/clouds/controllers/compute/controllers.py
+16 −0		src/mist/api/config.py
+0 −6		src/mist/api/helpers.py
+70 −0		src/mist/api/machines/controllers.py
+23 −3		src/mist/api/machines/methods.py
+13 −0		src/mist/api/machines/models.py
+73 −2		src/mist/api/machines/views.py
+44 −15		src/mist/api/schedules/base.py
+3 −1		src/mist/api/schedules/methods.py
+8 −0		src/mist/api/schedules/models.py
+60 −37		src/mist/api/tasks.py
+1 −0		src/landing-app.html
+2 −4		src/landing-category-data.html
+80 −9		src/app-form/app-form.html
+175 −0		src/app-form/duration-field.html
+125 −0		src/app-form/sub-fieldgroup.html
+75 −3		src/machine-create-fields.js
+2 −1		src/machines/machine-create.html
+213 −0		src/machines/machine-expiration-edit.html
+83 −8		src/machines/machine-page.html
+2 −2		src/mist-rules/rule-edit.html
+37 −8		src/page-machines.html
+1 −1		src/page-schedules.html
+4 −4		src/schedules/schedule-add.html
+3 −1		src/schedules/schedule-edit-condition.html
+9 −11		src/schedules/schedule-edit-task.html
+1 −1		src/schedules/schedule-page.html
+1 −4		src/styles/shared-styles.html