diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2018-11-29 13:50:19 +1300 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2018-12-05 10:16:44 +1300 |
| commit | ebf87fd9c2e1c5bde72f2c08db0fff7e81882cb8 (patch) | |
| tree | 453086b0791d9376dcfa1d10b841919b1d7cabaf /app/controllers | |
| parent | f85440e63c2eba453e09a5599f0d3e0491a037f1 (diff) | |
| download | gitlab-ce-ebf87fd9c2e1c5bde72f2c08db0fff7e81882cb8.tar.gz | |
Unify into :group_clusters feature flag
With this MR, group clusters is now functional, so default to enabled.
Have a single setting on the root ancestor group to enabled or disable
group clusters feature as a whole
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/groups/clusters_controller.rb | 8 |
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 |