summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorChris Baumbauer <cab@cabnetworks.net>2018-11-06 11:52:40 -0800
committerChris Baumbauer <cab@cabnetworks.net>2018-11-06 11:52:40 -0800
commitc6585220b5bcba6d9eb31fe74194adef7eed9719 (patch)
tree68ddaccf37369036f706ee1e683027839ce52582 /app
parente5c408e44549b2e8a32492ba6ab10b45727c44dd (diff)
downloadgitlab-ce-c6585220b5bcba6d9eb31fe74194adef7eed9719.tar.gz
Resolve bug with knative hostname being overwritten by status updates
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/clusters/stores/clusters_store.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js
index f4a016f3ef1..5ec276f7788 100644
--- a/app/assets/javascripts/clusters/stores/clusters_store.js
+++ b/app/assets/javascripts/clusters/stores/clusters_store.js
@@ -102,9 +102,8 @@ export default class ClusterStore {
? `jupyter.${this.state.applications.ingress.externalIp}.nip.io`
: '');
} else if (appId === KNATIVE) {
- this.state.applications.knative.hostname = serverAppEntry.hostname
- ? serverAppEntry.hostname
- : null;
+ this.state.applications.knative.hostname = serverAppEntry.hostname ||
+ this.state.applications.knative.hostname;
}
});
}