Merge branch 'ff_custom_compliance_frameworks_default_on' into 'master'

Enables custom compliance frameworks by default

See merge request gitlab-org/gitlab!57218

doc/user/project/settings/index.md

@@ -48,11 +48,10 @@ Compliance framework labels do not affect your project settings.
 #### Custom compliance frameworks
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/276221) in GitLab 13.9.
-> - It's [deployed behind a feature flag](../../feature_flags.md), disabled by default.
-> - It can be enabled or disabled for a single group
-> - It's disabled on GitLab.com.
-> - It's not recommended for production use.
-> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-custom-compliance-frameworks). **(PREMIUM)**
+> - [Deployed behind a feature flag](../../feature_flags.md).
+> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/287779) in GitLab 13.11.
+> - Enabled on GitLab.com.
+> - Recommended for production use.
 
 WARNING:
 This feature might not be available to you. Check the **version history** note above for details.

ee/app/policies/compliance_management/framework_policy.rb

@@ -6,7 +6,7 @@ module ComplianceManagement
 
     condition(:custom_compliance_frameworks_enabled) do
       @subject.namespace.feature_available?(:custom_compliance_frameworks) &&
-        Feature.enabled?(:ff_custom_compliance_frameworks, @subject.namespace)
+        Feature.enabled?(:ff_custom_compliance_frameworks, @subject.namespace, default_enabled: :yaml)
     end
 
     condition(:group_level_compliance_pipeline_enabled) do

ee/app/policies/ee/group_policy.rb

@@ -126,7 +126,7 @@ module EE
 
       condition(:compliance_framework_available) do
         @subject.feature_available?(:custom_compliance_frameworks) &&
-          ::Feature.enabled?(:ff_custom_compliance_frameworks, @subject)
+          ::Feature.enabled?(:ff_custom_compliance_frameworks, @subject, default_enabled: :yaml)
       end
 
       condition(:group_level_compliance_pipeline_available) do

ee/app/policies/ee/namespace_policy.rb

@@ -8,7 +8,7 @@ module EE
       condition(:over_storage_limit, scope: :subject) { @subject.over_storage_limit? }
       condition(:compliance_framework_available) do
         @subject.feature_available?(:custom_compliance_frameworks) &&
-          ::Feature.enabled?(:ff_custom_compliance_frameworks, @subject)
+          ::Feature.enabled?(:ff_custom_compliance_frameworks, @subject, default_enabled: :yaml)
       end
 
       rule { admin & is_gitlab_com }.enable :update_subscription_limit

ee/app/policies/ee/project_policy.rb

@@ -61,7 +61,7 @@ module EE
       end
 
       condition(:custom_compliance_framework_available) do
-        ::Feature.enabled?(:ff_custom_compliance_frameworks)
+        ::Feature.enabled?(:ff_custom_compliance_frameworks, default_enabled: :yaml)
       end
 
       with_scope :subject

ee/app/services/ee/projects/update_service.rb

@@ -81,7 +81,7 @@ module EE
           framework_identifier = settings.delete(:framework)
           if framework_identifier.blank?
             settings.merge!(_destroy: true)
-          elsif ::Feature.enabled?(:ff_custom_compliance_frameworks, project.namespace)
+          elsif ::Feature.enabled?(:ff_custom_compliance_frameworks, project.namespace, default_enabled: :yaml)
             settings[:compliance_management_framework] = project.namespace.root_ancestor.compliance_management_frameworks.find(framework_identifier)
           else
             settings[:compliance_management_framework] = ComplianceManagement::Framework.find_or_create_legacy_default_framework(project, framework_identifier)

ee/app/views/compliance_management/compliance_framework/_project_settings.html.haml

 - user_has_edit_permissions = current_user.can?(:admin_compliance_framework, @project)
 .row
   .form-group.col-md-9.gl-mb-6
-    - if Feature.enabled?(:ff_custom_compliance_frameworks, @project.namespace)
+    - if Feature.enabled?(:ff_custom_compliance_frameworks, @project.namespace, default_enabled: :yaml)
       - frameworks = @project.namespace.root_ancestor.compliance_management_frameworks
       - if user_has_edit_permissions
         = f.fields_for :compliance_framework_setting, ComplianceManagement::ComplianceFramework::ProjectSettings.new do |cf|

ee/changelogs/unreleased/ff_custom_compliance_frameworks_default_on.yml

+---
+title: Enable custom compliance frameworks
+merge_request:
+author:
+type: added

ee/config/feature_flags/development/ff_custom_compliance_frameworks.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/287779
 milestone: '13.7'
 type: development
 group: group::compliance
-default_enabled: false
+default_enabled: true