Merge branch 'enable-gpg-keys-feature-flag-by-default' into 'master'

Enable :credential_inventory_gpg_keys by default and update docs

See merge request gitlab-org/gitlab!56764

doc/user/admin_area/credentials_inventory.md

@@ -56,10 +56,14 @@ The instance then notifies the user.
 ## Review existing GPG keys
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/282429) in GitLab 13.10.
-> - It's [deployed behind a feature flag](../feature_flags.md), disabled by default.
-> - 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-the-gpg-keys-view).
+> - It was [deployed behind a feature flag](../feature_flags.md), disabled by default.
+> - [Became enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/292961) on GitLab 13.11.
+> - It's enabled on GitLab.com.
+> - It's recommended for production use.
+> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-the-gpg-keys-view).
+
+WARNING:
+This feature might not be available to you. Check the **version history** note above for details.
 
 You can view all existing GPG in your GitLab instance by navigating to the 
 credentials inventory GPG Keys tab, as well as the following properties:
@@ -72,10 +76,10 @@ credentials inventory GPG Keys tab, as well as the following properties:
 
 ### Enable or disable the GPG keys view
 
-Enabling or disabling the GPG keys view is under development and not ready for production use. It is
-deployed behind a feature flag that is **disabled by default**.
+Enabling or disabling the GPG keys view is under development but ready for production use.
+It 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.
+can opt to disable it.
 
 To enable it:
 

ee/app/controllers/admin/credentials_controller.rb

@@ -22,7 +22,7 @@ class Admin::CredentialsController < Admin::ApplicationController
   end
 
   def check_gpg_keys_list_enabled!
-    render_404 if show_gpg_keys? && Feature.disabled?(:credential_inventory_gpg_keys)
+    render_404 if show_gpg_keys? && Feature.disabled?(:credential_inventory_gpg_keys, default_enabled: :yaml)
   end
 
   override :credentials_inventory_path
@@ -57,7 +57,7 @@ class Admin::CredentialsController < Admin::ApplicationController
 
   override :gpg_keys_available?
   def gpg_keys_available?
-    Feature.enabled?(:credential_inventory_gpg_keys)
+    Feature.enabled?(:credential_inventory_gpg_keys, default_enabled: :yaml)
   end
 
   override :users

ee/changelogs/unreleased/set-credential-inventory-gpg-keys-feature-flag-to-enabled-by-default.yml

+---
+title: Set credential_inventory_gpg_keys feature-flag to enabled by default
+merge_request: 56764
+author:
+type: changed

ee/config/feature_flags/development/credential_inventory_gpg_keys.yml

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