Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-26 03:06:20 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-26 03:06:20 +0300
commit1ba0707c21da17d1c107ba2da1e7a3de9d63573a (patch)
treeb85258b333bccfd5c0b27698024cfe43f359319e /app/services
parente95a97594ae2da675cb80fdb2ecb2ae64526d1d4 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
-rw-r--r--app/services/clusters/applications/base_service.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/app/services/clusters/applications/base_service.rb b/app/services/clusters/applications/base_service.rb
index b39fc7d20a9..1a6f6e3aa6f 100644
--- a/app/services/clusters/applications/base_service.rb
+++ b/app/services/clusters/applications/base_service.rb
@@ -64,19 +64,13 @@ module Clusters
end
def invalid_application?
- unknown_application? || (!cluster.project_type? && project_only_application?) || (application_name == Applications::ElasticStack.application_name && !Feature.enabled?(:enable_cluster_application_elastic_stack))
+ unknown_application? || (application_name == Applications::ElasticStack.application_name && !Feature.enabled?(:enable_cluster_application_elastic_stack))
end
def unknown_application?
Clusters::Cluster::APPLICATIONS.keys.exclude?(application_name)
end
- # These applications will need extra configuration to enable them to work
- # with groups of projects
- def project_only_application?
- Clusters::Cluster::PROJECT_ONLY_APPLICATIONS.include?(application_name)
- end
-
def application_name
params[:application]
end