summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorChris Baumbauer <cab@cabnetworks.net>2018-10-30 22:15:23 -0700
committerChris Baumbauer <cab@cabnetworks.net>2018-10-30 22:15:23 -0700
commit0a62588be7a6d6c95d4989eefbdb263f00e9966b (patch)
tree149a0e07835cc6dd3d3a54245005edc7d9bf602e /app/assets
parent6aa0645fa780d220cab0e730e1bcbdaeed6d0ff4 (diff)
downloadgitlab-ce-0a62588be7a6d6c95d4989eefbdb263f00e9966b.tar.gz
Fix remaining domainname -> hostname rebranding
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/clusters/components/applications.vue6
-rw-r--r--app/assets/javascripts/clusters/constants.js1
-rw-r--r--app/assets/javascripts/clusters/stores/clusters_store.js4
3 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index e1d868dbac4..703b0c48934 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -383,7 +383,7 @@ export default {
:status-reason="applications.knative.statusReason"
:request-status="applications.knative.requestStatus"
:request-reason="applications.knative.requestReason"
- :install-application-request-params="{ hostname: applications.knative.domainname}"
+ :install-application-request-params="{ hostname: applications.knative.hostname}"
:disabled="!helmInstalled"
class="hide-bottom-border rounded-bottom"
title-link="https://github.com/knative/docs"
@@ -405,7 +405,7 @@ export default {
</label>
<input
id="knative-domainname"
- v-model="applications.knative.domainname"
+ v-model="applications.knative.hostname"
type="text"
class="form-control js-domainname"
readonly
@@ -419,7 +419,7 @@ export default {
</label>
<input
id="knative-domainname"
- v-model="applications.knative.domainname"
+ v-model="applications.knative.hostname"
type="text"
class="form-control js-domainname"
/>
diff --git a/app/assets/javascripts/clusters/constants.js b/app/assets/javascripts/clusters/constants.js
index 24a49624583..d707420c845 100644
--- a/app/assets/javascripts/clusters/constants.js
+++ b/app/assets/javascripts/clusters/constants.js
@@ -16,3 +16,4 @@ export const REQUEST_SUCCESS = 'request-success';
export const REQUEST_FAILURE = 'request-failure';
export const INGRESS = 'ingress';
export const JUPYTER = 'jupyter';
+export const KNATIVE = 'knative';
diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js
index 3727c147641..f8e8bf3cc40 100644
--- a/app/assets/javascripts/clusters/stores/clusters_store.js
+++ b/app/assets/javascripts/clusters/stores/clusters_store.js
@@ -1,5 +1,5 @@
import { s__ } from '../../locale';
-import { INGRESS, JUPYTER } from '../constants';
+import { INGRESS, JUPYTER, KNATIVE } from '../constants';
export default class ClusterStore {
constructor() {
@@ -105,6 +105,8 @@ export default class ClusterStore {
(this.state.applications.ingress.externalIp
? `jupyter.${this.state.applications.ingress.externalIp}.nip.io`
: '');
+ } else if (appId === KNATIVE) {
+ this.state.applications.knative.hostname = serverAppEntry.hostname ? serverAppEntry.hostname : '';
}
});
}