Merge branch 'ali/remove-deployment-approvals-ff' into 'master'

Remove deployment_approvals feature flag

See merge request gitlab-org/gitlab!79681

config/feature_flags/development/deployment_approvals.yml

----
-name: deployment_approvals
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74932
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347342
-milestone: '14.6'
-type: development
-group: group::release
-default_enabled: false

doc/api/deployments.md

@@ -448,7 +448,10 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/a
 
 ## Approve or reject a blocked deployment **(PREMIUM)**
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/343864) in GitLab 14.7 [with a flag](../administration/feature_flags.md) named `deployment_approvals`. Disabled by default. This feature is not ready for production use.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/343864) in GitLab 14.7 [with a flag](../administration/feature_flags.md) named `deployment_approvals`. Disabled by default.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/347342) in GitLab 14.8.
+
+See [Deployment Approvals](../ci/environments/deployment_approvals.md) for more information about this feature.
 
 ```plaintext
 POST /projects/:id/deployments/:deployment_id/approval

doc/ci/environments/deployment_approvals.md

@@ -7,7 +7,8 @@ description: Require approvals prior to deploying to a Protected Environment
 
 # Deployment approvals **(PREMIUM)**
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/343864) in GitLab 14.7 with a flag named `deployment_approvals`. Disabled by default.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/343864) in GitLab 14.7 with a flag named `deployment_approvals`. Disabled by default.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/347342) in GitLab 14.8.
 
 WARNING:
 This feature is in an alpha stage and subject to change without prior notice.

ee/app/models/ee/environment.rb

@@ -80,8 +80,6 @@ module EE
     end
 
     def needs_approval?
-      return false unless ::Feature.enabled?(:deployment_approvals, project, default_enabled: :yaml)
-
       required_approval_count > 0
     end
 

ee/lib/ee/api/deployments.rb

@@ -11,7 +11,7 @@ module EE
         end
         resource :projects, requirements: ::API::API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
           desc 'Approve or reject a blocked deployment' do
-            detail 'This feature is gated behind the :deployment_approvals feature flag.'
+            detail 'This feature was introduced in GitLab 14.8.'
             success ::API::Entities::Deployments::Approval
           end
           params do

ee/spec/models/environment_spec.rb

@@ -259,14 +259,6 @@ RSpec.describe Environment, :use_clean_rails_memory_store_caching do
         let(:required_approval_count) { 1 }
 
         it { is_expected.to be_truthy }
-
-        context 'and deployment_approvals feature flag turned off' do
-          before do
-            stub_feature_flags(deployment_approvals: false)
-          end
-
-          it { is_expected.to be_falsey }
-        end
       end
 
       context 'with no approvals required' do