Merge branch '34758-deployment-cluster' into 'master'

Use group clusters when deploying (DeploymentPlatform)

See merge request gitlab-org/gitlab-ce!22308

1 files changed, 6 insertions, 2 deletions

diff --git a/app/controllers/groups/clusters_controller.rb b/app/controllers/groups/clusters_controller.rb
index 50c44b7a58b..b846fb21266 100644
--- a/app/controllers/groups/clusters_controller.rb
+++ b/app/controllers/groups/clusters_controller.rb
@@ -3,8 +3,8 @@
 class Groups::ClustersController < Clusters::ClustersController
   include ControllerWithCrossProjectAccessCheck
 
-  prepend_before_action :check_group_clusters_feature_flag!
   prepend_before_action :group
+  prepend_before_action :check_group_clusters_feature_flag!
   requires_cross_project_access
 
   layout 'group'
@@ -20,6 +20,10 @@ class Groups::ClustersController < Clusters::ClustersController
   end
 
   def check_group_clusters_feature_flag!
-    render_404 unless Feature.enabled?(:group_clusters)
+    render_404 unless group_clusters_enabled?
+  end
+
+  def group_clusters_enabled?
+    group.group_clusters_enabled?
   end
 end