Merge branch '329886-remove-sec_secret_detection_ui_enable-ff' into 'master'

Remove the sec_secret_detection_ui_enable feature flag

See merge request gitlab-org/gitlab!65055

doc/user/application_security/secret_detection/index.md

@@ -139,18 +139,8 @@ always take the latest Secret Detection artifact available.
 
 ### Enable Secret Detection via an automatic merge request **(ULTIMATE SELF)**
 
-> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/4496) in GitLab 13.11.
-> - [Deployed behind a feature flag](../../../user/feature_flags.md), enabled by default.
-> - Enabled on GitLab.com.
-> - Recommended for production use.
-> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-configure-secret-detection-via-a-merge-request). **(ULTIMATE SELF)**
-
-WARNING:
-This feature might not be available to you. Check the **version history** note above for details.
-
-There can be
-[risks when disabling released features](../../../user/feature_flags.md#risks-when-disabling-released-features).
-Refer to this feature's version history for more details.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/4496) in GitLab 13.11, behind a feature flag, enabled by default.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/329886) in GitLab 14.1.
 
 To enable Secret Detection in a project, you can create a merge request
 from the Security Configuration page.
@@ -409,22 +399,3 @@ secret_detection:
   variables:
     GIT_DEPTH: 100
 ```
-
-### Enable or disable Configure Secret Detection via a Merge Request
-
-Configure Secret Detection via a Merge Request 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 opt to disable it.
-
-To enable it:
-
-```ruby
-Feature.enable(:sec_secret_detection_ui_enable)
-```
-
-To disable it:
-
-```ruby
-Feature.disable(:sec_secret_detection_ui_enable)
-```

ee/app/assets/javascripts/security_configuration/components/manage_feature.vue

@@ -25,9 +25,6 @@ export default {
       if (!this.glFeatures.secDependencyScanningUiEnable) {
         delete scannerComponentMapCopy[REPORT_TYPE_DEPENDENCY_SCANNING];
       }
-      if (!this.glFeatures.secSecretDetectionUiEnable) {
-        delete scannerComponentMapCopy[REPORT_TYPE_SECRET_DETECTION];
-      }
       return scannerComponentMapCopy;
     },
     manageComponent() {

ee/app/controllers/ee/projects/security/configuration_controller.rb

@@ -15,7 +15,6 @@ module EE
           before_action only: [:show] do
             push_frontend_feature_flag(:security_auto_fix, project, default_enabled: false)
             push_frontend_feature_flag(:sec_dependency_scanning_ui_enable, project, default_enabled: :yaml)
-            push_frontend_feature_flag(:sec_secret_detection_ui_enable, project, default_enabled: :yaml)
             push_frontend_feature_flag(:dast_configuration_ui, project, default_enabled: :yaml)
           end
 

ee/config/feature_flags/development/sec_secret_detection_ui_enable.yml

----
-name: sec_secret_detection_ui_enable
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57869
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326049
-milestone: '13.11'
-type: development
-group: group::static analysis
-default_enabled: true

ee/spec/frontend/security_configuration/components/manage_feature_spec.js

@@ -22,7 +22,6 @@ describe('ManageFeature component', () => {
       provide: {
         glFeatures: {
           secDependencyScanningUiEnable: true,
-          secSecretDetectionUiEnable: true,
         },
       },
       ...options,
@@ -80,7 +79,6 @@ describe('ManageFeature component', () => {
   it.each`
     type                               | featureFlag
     ${REPORT_TYPE_DEPENDENCY_SCANNING} | ${'secDependencyScanningUiEnable'}
-    ${REPORT_TYPE_SECRET_DETECTION}    | ${'secSecretDetectionUiEnable'}
   `('renders generic component for $type if $featureFlag is disabled', ({ type, featureFlag }) => {
     const [feature] = generateFeatures(1, { type });
     createComponent({