diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 15:06:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 15:06:06 +0000 |
| commit | 6653aab95dfdfd260e8814e7499cc2345f451f99 (patch) | |
| tree | 695acdeb5be70a87a26e39a592dd302f29d1c1fc /app/controllers/clusters | |
| parent | b1bcdba89bc241e2cede910f26cf3f5fff8d7901 (diff) | |
| download | gitlab-ce-6653aab95dfdfd260e8814e7499cc2345f451f99.tar.gz | |
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 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/clusters/applications_controller.rb b/app/controllers/clusters/applications_controller.rb index 16c2365f85d..5364116a5f8 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, :email) + params.permit(:application, :hostname, :kibana_hostname, :email) end def cluster_application_destroy_params diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb index 993aba661f3..bb47ccb72b3 100644 --- a/app/controllers/clusters/clusters_controller.rb +++ b/app/controllers/clusters/clusters_controller.rb @@ -15,6 +15,9 @@ class Clusters::ClustersController < Clusters::BaseController before_action only: [:new, :create_gcp] do push_frontend_feature_flag(:create_eks_clusters) end + before_action only: [:show] do + push_frontend_feature_flag(:enable_cluster_application_elastic_stack) + end helper_method :token_in_session |