diff --git a/config/feature_flags/development/support_group_level_merge_checks_setting.yml b/config/feature_flags/development/support_group_level_merge_checks_setting.yml deleted file mode 100644 index 4537c5ff5b7877ca244496616fac1af18d000d90..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/support_group_level_merge_checks_setting.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: support_group_level_merge_checks_setting -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102864 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377723 -milestone: '15.8' -type: development -group: group::code review -default_enabled: true diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md index 205d05e5de8e73b5131ec8980c042c42333e1349..278fc1326ce98b2a225a860ec6b6a8b787558037 100644 --- a/doc/user/group/manage.md +++ b/doc/user/group/manage.md @@ -369,11 +369,7 @@ DETAILS: **Offering:** SaaS, self-managed > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/372040) in GitLab 15.9 [with a flag](../../administration/feature_flags.md) name `support_group_level_merge_checks_setting`. Disabled by default. - -FLAG: -On self-managed GitLab, by default this feature is not available. To make it available, an administrator can -[enable the feature flag](../../administration/feature_flags.md) named `support_group_level_merge_checks_setting`. On GitLab.com, this feature is not -available. +> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/142708) in GitLab 16.9. Feature flag `support_group_level_merge_checks_setting` removed. Group owners can set up merge request checks on a top-level group, which apply to all subgroups and projects. diff --git a/ee/app/models/ee/project.rb b/ee/app/models/ee/project.rb index 439a51e06cf0397a889d4c280fad073fb5b158f4..7c3c110eb6a595611a08d3eec61ff1f951859d08 100644 --- a/ee/app/models/ee/project.rb +++ b/ee/app/models/ee/project.rb @@ -441,7 +441,7 @@ def self.cascading_with_parent_namespace(attribute) end define_method("#{attribute}?") do |inherit_group_setting: false| - return super() unless licensed_feature_available?(:group_level_merge_checks_setting) && ::Feature.enabled?(:support_group_level_merge_checks_setting, self) + return super() unless licensed_feature_available?(:group_level_merge_checks_setting) if inherit_group_setting result = self.public_send(attribute) || public_send("#{attribute}_of_parent_group") # rubocop:disable GitlabSecurity/PublicSend @@ -453,7 +453,7 @@ def self.cascading_with_parent_namespace(attribute) end define_method("#{attribute}_locked?") do - return super() unless licensed_feature_available?(:group_level_merge_checks_setting) && ::Feature.enabled?(:support_group_level_merge_checks_setting, self) + return super() unless licensed_feature_available?(:group_level_merge_checks_setting) public_send("#{attribute}_of_parent_group") # rubocop:disable GitlabSecurity/PublicSend end diff --git a/ee/app/views/groups/settings/merge_requests/_merge_requests.html.haml b/ee/app/views/groups/settings/merge_requests/_merge_requests.html.haml index af2a2936f49a3f45be03482a56432abcc2e10ce5..d6b0b23a965afb0ec296a5a0eea74763fb527e6b 100644 --- a/ee/app/views/groups/settings/merge_requests/_merge_requests.html.haml +++ b/ee/app/views/groups/settings/merge_requests/_merge_requests.html.haml @@ -1,4 +1,4 @@ -- if Feature.enabled?(:support_group_level_merge_checks_setting, @group) && @group.licensed_feature_available?(:group_level_merge_checks_setting) +- if @group.licensed_feature_available?(:group_level_merge_checks_setting) %section.settings.no-animate#js-merge-requests-settings{ class: ('expanded' if expanded) } .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' } diff --git a/ee/app/views/projects/settings/merge_requests/_merge_request_pipelines_and_threads_options.html.haml b/ee/app/views/projects/settings/merge_requests/_merge_request_pipelines_and_threads_options.html.haml index 835cb787313b035af7cc54e68c085f855a6486b8..183c6caa51c93f7b8531ff1ac1b409d9747fe68a 100644 --- a/ee/app/views/projects/settings/merge_requests/_merge_request_pipelines_and_threads_options.html.haml +++ b/ee/app/views/projects/settings/merge_requests/_merge_request_pipelines_and_threads_options.html.haml @@ -1,4 +1,4 @@ -- support_group_level_mr_setting = Feature.enabled?(:support_group_level_merge_checks_setting, @project) && @project.licensed_feature_available?(:group_level_merge_checks_setting) +- support_group_level_mr_setting = @project.licensed_feature_available?(:group_level_merge_checks_setting) - if !support_group_level_mr_setting = render_ce 'projects/settings/merge_requests/merge_request_pipelines_and_threads_options', form: form, project: project