summaryrefslogtreecommitdiff
path: root/app/controllers/groups
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2019-06-28 00:17:26 +1200
committerThong Kuah <tkuah@gitlab.com>2019-06-28 00:28:03 +1200
commit3f759e1674b19f9fc7690239c138fca8aeec6434 (patch)
tree2cf01753bf63f2003e1d9af77618194459b2a70c /app/controllers/groups
parent47089be063b754b3cc76c47bda7d26876889e5de (diff)
downloadgitlab-ce-3f759e1674b19f9fc7690239c138fca8aeec6434.tar.gz
Remove group_clusters feature flag
Now we have terminals for instance and group clusters we can remove the FF now. Deploying to group clusters has been working without complaints too.
Diffstat (limited to 'app/controllers/groups')
-rw-r--r--app/controllers/groups/clusters_controller.rb9
1 files changed, 0 insertions, 9 deletions
diff --git a/app/controllers/groups/clusters_controller.rb b/app/controllers/groups/clusters_controller.rb
index b846fb21266..92602fd8096 100644
--- a/app/controllers/groups/clusters_controller.rb
+++ b/app/controllers/groups/clusters_controller.rb
@@ -4,7 +4,6 @@ class Groups::ClustersController < Clusters::ClustersController
include ControllerWithCrossProjectAccessCheck
prepend_before_action :group
- prepend_before_action :check_group_clusters_feature_flag!
requires_cross_project_access
layout 'group'
@@ -18,12 +17,4 @@ class Groups::ClustersController < Clusters::ClustersController
def group
@group ||= find_routable!(Group, params[:group_id] || params[:id])
end
-
- def check_group_clusters_feature_flag!
- render_404 unless group_clusters_enabled?
- end
-
- def group_clusters_enabled?
- group.group_clusters_enabled?
- end
end