Merge branch 'confepics-enable' into 'master'

Enable confidential_epics flag by default

See merge request gitlab-org/gitlab!36271

doc/user/group/epics/manage_epics.md

@@ -118,23 +118,17 @@ The sort option and order is saved and used wherever you browse epics, including
 
 ## Make an epic confidential
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/213068) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.0 behind a feature flag, disabled by default.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/213068) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.0 behind a feature flag, disabled by default.
+> - [Became enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/224513) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.2.
 
 When you're creating an epic, you can make it confidential by selecting the **Make this epic
 confidential** checkbox.
 
-### Enable confidential epics **(PREMIUM ONLY)**
+### Disable confidential epics **(PREMIUM ONLY)**
 
-The confidential epics feature is under development and not ready for production use. It's deployed
-behind a feature flag that is **disabled by default**.
+The confidential epics feature is deployed behind a feature flag that is **enabled by default**.
 [GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
-can enable it for your self-managed instance.
-
-To enable it:
-
-```ruby
-Feature.enable(:confidential_epics)
-```
+can disable it for your self-managed instance.
 
 To disable it:
 

ee/app/controllers/groups/epics_controller.rb

@@ -18,7 +18,7 @@ class Groups::EpicsController < Groups::ApplicationController
 
   before_action do
     push_frontend_feature_flag(:vue_issuable_epic_sidebar, @group)
-    push_frontend_feature_flag(:confidential_epics, @group)
+    push_frontend_feature_flag(:confidential_epics, @group, default_enabled: true)
   end
 
   def index

ee/app/controllers/groups/roadmap_controller.rb

@@ -11,7 +11,7 @@ module Groups
     before_action :persist_roadmap_layout, only: [:show]
     before_action do
       push_frontend_feature_flag(:roadmap_buffered_rendering, @group)
-      push_frontend_feature_flag(:confidential_epics, @group)
+      push_frontend_feature_flag(:confidential_epics, @group, default_enabled: true)
     end
 
     # show roadmap for a group

ee/app/serializers/epic_entity.rb

@@ -19,7 +19,7 @@ class EpicEntity < IssuableEntity
   expose :due_date_fixed, :due_date_from_milestones
   expose :state
   expose :lock_version
-  expose :confidential, if: -> (epic) { Feature.enabled?(:confidential_epics, epic.group) }
+  expose :confidential, if: -> (epic) { Feature.enabled?(:confidential_epics, epic.group, default_enabled: true) }
 
   expose :web_url do |epic|
     group_epic_path(epic.group, epic)

ee/app/services/epics/create_service.rb

@@ -4,7 +4,7 @@ module Epics
   class CreateService < Epics::BaseService
     def execute
       set_date_params
-      params.extract!(:confidential) unless ::Feature.enabled?(:confidential_epics, group)
+      params.extract!(:confidential) unless ::Feature.enabled?(:confidential_epics, group, default_enabled: true)
 
       epic = group.epics.new
       create(epic)

ee/changelogs/unreleased/confepics-enable.yml

+---
+title: Allow creating confidential epics.
+merge_request: 36271
+author:
+type: added