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/controllers/clusters | |
| parent | 7f4a1ba886819078d1fa0bfc348e3743f0e2b2f2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/clusters')
| -rw-r--r-- | app/controllers/clusters/applications_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/clusters/clusters_controller.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/clusters/applications_controller.rb b/app/controllers/clusters/applications_controller.rb index 5364116a5f8..be68d0d0a1d 100644 --- a/app/controllers/clusters/applications_controller.rb +++ b/app/controllers/clusters/applications_controller.rb @@ -47,7 +47,7 @@ class Clusters::ApplicationsController < Clusters::BaseController end def cluster_application_params - params.permit(:application, :hostname, :kibana_hostname, :email) + params.permit(:application, :hostname, :kibana_hostname, :email, :stack) end def cluster_application_destroy_params diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb index 5d6ce4f342c..9a539cf7c24 100644 --- a/app/controllers/clusters/clusters_controller.rb +++ b/app/controllers/clusters/clusters_controller.rb @@ -17,6 +17,7 @@ class Clusters::ClustersController < Clusters::BaseController end before_action only: [:show] do push_frontend_feature_flag(:enable_cluster_application_elastic_stack) + push_frontend_feature_flag(:enable_cluster_application_crossplane) end helper_method :token_in_session |