diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-26 00:06:20 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-26 00:06:20 +0000 |
commit | 1ba0707c21da17d1c107ba2da1e7a3de9d63573a (patch) | |
tree | b85258b333bccfd5c0b27698024cfe43f359319e /app/models/clusters | |
parent | e95a97594ae2da675cb80fdb2ecb2ae64526d1d4 (diff) | |
download | gitlab-ce-1ba0707c21da17d1c107ba2da1e7a3de9d63573a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/clusters')
-rw-r--r-- | app/models/clusters/cluster.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index e3e2f06c313..acd744bfaf5 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -9,8 +9,6 @@ module Clusters self.table_name = 'clusters' - PROJECT_ONLY_APPLICATIONS = { - }.freeze APPLICATIONS = { Applications::Helm.application_name => Applications::Helm, Applications::Ingress.application_name => Applications::Ingress, @@ -20,7 +18,7 @@ module Clusters Applications::Jupyter.application_name => Applications::Jupyter, Applications::Knative.application_name => Applications::Knative, Applications::ElasticStack.application_name => Applications::ElasticStack - }.merge(PROJECT_ONLY_APPLICATIONS).freeze + }.freeze DEFAULT_ENVIRONMENT = '*' KUBE_INGRESS_BASE_DOMAIN = 'KUBE_INGRESS_BASE_DOMAIN' |