Merge branch 'remove-feature-flag-cd_skipped_deployment_status' into 'master'

Remove `cd_skipped_deployment_status` feature flag

See merge request gitlab-org/gitlab!51068

app/models/ci/build.rb

@@ -389,12 +389,8 @@ module Ci
       end
 
       after_transition any => [:skipped, :canceled] do |build, transition|
-        if Feature.enabled?(:cd_skipped_deployment_status, build.project)
-          if transition.to_name == :skipped
-            build.deployment&.skip
-          else
-            build.deployment&.cancel
-          end
+        if transition.to_name == :skipped
+          build.deployment&.skip
         else
           build.deployment&.cancel
         end

changelogs/unreleased/remove-feature-flag-cd_skipped_deployment_status.yml

+---
+title: Add skipped status to deployments
+merge_request: 51068
+author:
+type: added

config/feature_flags/development/cd_skipped_deployment_status.yml

-name: cd_skipped_deployment_status
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46614
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/283884
-milestone: '13.6'
-type: development
-group: group::release
-default_enabled: false

spec/models/ci/build_spec.rb

@@ -1183,26 +1183,12 @@ RSpec.describe Ci::Build do
     end
 
     context 'when transits to skipped' do
-      context 'when cd_skipped_deployment_status is disabled' do
-        before do
-          stub_feature_flags(cd_skipped_deployment_status: false)
-          build.skip!
-        end
-
-        it 'transits deployment status to canceled' do
-          expect(deployment).to be_canceled
-        end
+      before do
+        build.skip!
       end
 
-      context 'when cd_skipped_deployment_status is enabled' do
-        before do
-          stub_feature_flags(cd_skipped_deployment_status: project)
-          build.skip!
-        end
-
-        it 'transits deployment status to skipped' do
-          expect(deployment).to be_skipped
-        end
+      it 'transits deployment status to skipped' do
+        expect(deployment).to be_skipped
       end
     end