kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Grzegorz Bizon | off until 20th June 2018-06-11 06:52:05 +00:00
parent f646a8b9bc a904314941
commit fad97f0973
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/clusters/stores/clusters_store.js
View File

@ -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`
: '');
}
});

2
spec/javascripts/clusters/stores/clusters_store_spec.js
View File

@ -110,7 +110,7 @@ describe('Clusters Store', () => {
expect(
store.state.applications.jupyter.hostname,
).toEqual(`jupyter.${store.state.applications.ingress.externalIp}.xip.io`);
).toEqual(`jupyter.${store.state.applications.ingress.externalIp}.nip.io`);
});
});
});