summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAmit Rathi <amit.juschill@gmail.com>2019-08-01 14:36:16 +0000
committerMike Greiling <mike@pixelcog.com>2019-08-01 14:36:16 +0000
commitf485686131b9fb2655856ddc35b011cb30dc90da (patch)
treead150b0ee4476764e39ec3e6dcd78e00ec192b78 /app/assets
parent760e75c8fa809fa6d3233700aa7eb99c15458d5a (diff)
downloadgitlab-ce-f485686131b9fb2655856ddc35b011cb30dc90da.tar.gz
Jupyter fix hostname editing and remove extra load balancer
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/clusters/stores/clusters_store.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js
index f64f0ca616f..ada5a49e246 100644
--- a/app/assets/javascripts/clusters/stores/clusters_store.js
+++ b/app/assets/javascripts/clusters/stores/clusters_store.js
@@ -171,6 +171,7 @@ export default class ClusterStore {
this.state.applications.cert_manager.email || serverAppEntry.email;
} else if (appId === JUPYTER) {
this.state.applications.jupyter.hostname =
+ this.state.applications.jupyter.hostname ||
serverAppEntry.hostname ||
(this.state.applications.ingress.externalIp
? `jupyter.${this.state.applications.ingress.externalIp}.nip.io`