diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-18 06:06:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-18 06:06:28 +0300 |
commit | c1f270b8ba4602952c36ce042e5eae439b22f9a6 (patch) | |
tree | 205917e3dc8dcaeaaa0de55e2618eaca4197c4c2 /app/services/clusters | |
parent | 7f4a1ba886819078d1fa0bfc348e3743f0e2b2f2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/clusters')
-rw-r--r-- | app/services/clusters/applications/base_service.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/clusters/applications/base_service.rb b/app/services/clusters/applications/base_service.rb index 1a6f6e3aa6f..c9f7917938f 100644 --- a/app/services/clusters/applications/base_service.rb +++ b/app/services/clusters/applications/base_service.rb @@ -27,6 +27,10 @@ module Clusters application.email = params[:email] end + if application.has_attribute?(:stack) + application.stack = params[:stack] + end + if application.respond_to?(:oauth_application) application.oauth_application = create_oauth_application(application, request) end @@ -64,7 +68,7 @@ module Clusters end def invalid_application? - unknown_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)) || (application_name == Applications::Crossplane.application_name && !Feature.enabled?(:enable_cluster_application_crossplane)) end def unknown_application? |