diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 21:08:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 21:08:31 +0300 |
| commit | 92f95ccac81911d1fcc32e999a7f1ce04624a56c (patch) | |
| tree | ad207e86b7858ae93a085fbdc04155f5cd469620 /app/controllers/clusters | |
| parent | 85e494935a8726dc98bb19ffa584488420e5011e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/clusters')
| -rw-r--r-- | app/controllers/clusters/clusters_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb index f4b74b14c0b..52a5f801bad 100644 --- a/app/controllers/clusters/clusters_controller.rb +++ b/app/controllers/clusters/clusters_controller.rb @@ -14,7 +14,6 @@ class Clusters::ClustersController < Clusters::BaseController before_action :update_applications_status, only: [:cluster_status] 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 |