summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGrzegorz Bizon | off until 20th June <grzegorz@gitlab.com>2018-06-11 06:52:05 +0000
committerGrzegorz Bizon | off until 20th June <grzegorz@gitlab.com>2018-06-11 06:52:05 +0000
commitfad97f097300960d35803522f4d378bfc05616c5 (patch)
treecabacbd33164dd59cbb09acbc939cece27a82399 /app
parentf646a8b9bc95fd6cecaa754f7dd0e8370c201502 (diff)
parenta904314941d42c41cab7760a154a1fcb3585dc27 (diff)
downloadgitlab-ce-fad97f097300960d35803522f4d378bfc05616c5.tar.gz
Merge branch 'dz-jupyter-use-nip-io' into 'master'
Use nip.io instead of xip.io for jupyter domain suggestion See merge request gitlab-org/gitlab-ce!19576
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/clusters/stores/clusters_store.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js
index 3a4ac09f67c..d90db7b103c 100644
--- a/app/assets/javascripts/clusters/stores/clusters_store.js
+++ b/app/assets/javascripts/clusters/stores/clusters_store.js
@@ -95,7 +95,7 @@ export default class ClusterStore {
this.state.applications.jupyter.hostname =
serverAppEntry.hostname ||
(this.state.applications.ingress.externalIp
- ? `jupyter.${this.state.applications.ingress.externalIp}.xip.io`
+ ? `jupyter.${this.state.applications.ingress.externalIp}.nip.io`
: '');
}
});