diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-28 02:01:08 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-28 02:01:08 +0300 |
| commit | 36451a753ac442250c1ed5a6427383817434d1ec (patch) | |
| tree | fa19d4a05b104c516961dd8bd0289846ccbc213f /app/controllers/groups | |
| parent | 62a40c5170cbecfc77dcb5fc97a23f3e93898a53 (diff) | |
| parent | 8152efbe2fc486520ec5cd11d54a49fbf7e554bf (diff) | |
Merge branch 'remove_group_and_instance_clusters_feature_flag' into 'master'
Remove group and instance clusters feature flag
Closes #63383
See merge request gitlab-org/gitlab-ce!30124
Diffstat (limited to 'app/controllers/groups')
| -rw-r--r-- | app/controllers/groups/clusters_controller.rb | 9 |
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 |