Merge branch '263412-remove-ci_manual_bridges' into 'master'

Remove feature flag ci_manual_bridges

See merge request gitlab-org/gitlab!48933

app/controllers/projects/jobs_controller.rb

@@ -207,11 +207,7 @@ class Projects::JobsController < Projects::ApplicationController
   end
 
   def find_job_as_processable
-    if ::Gitlab::Ci::Features.manual_bridges_enabled?(project)
-      @build = project.processables.find(params[:id])
-    else
-      find_job_as_build
-    end
+    @build = project.processables.find(params[:id])
   end
 
   def build_path(build)

app/models/ci/bridge.rb

@@ -132,14 +132,10 @@ module Ci
     end
 
     def playable?
-      return false unless ::Gitlab::Ci::Features.manual_bridges_enabled?(project)
-
       action? && !archived? && manual?
     end
 
     def action?
-      return false unless ::Gitlab::Ci::Features.manual_bridges_enabled?(project)
-
       %w[manual].include?(self.when)
     end
 

config/feature_flags/development/ci_manual_bridges.yml

----
-name: ci_manual_bridges
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44011
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263412
-milestone: '13.5'
-type: development
-group: group::pipeline authoring
-default_enabled: true

doc/ci/yaml/README.md

@@ -2273,9 +2273,6 @@ You can use [protected branches](../../user/project/protected_branches.md) to mo
 In [GitLab 13.5](https://gitlab.com/gitlab-org/gitlab/-/issues/201938) and later, you
 can use `when:manual` in the same job as [`trigger`](#trigger). In GitLab 13.4 and
 earlier, using them together causes the error `jobs:#{job-name} when should be on_success, on_failure or always`.
-It is deployed behind the `:ci_manual_bridges` [feature flag](../../user/feature_flags.md), which is **enabled by default**.
-[GitLab administrators with access to the Rails console](../../administration/feature_flags.md)
-can opt to disable it.
 
 ##### Protecting manual jobs **(PREMIUM)**
 
@@ -3515,9 +3512,6 @@ hover over the downstream pipeline job.
 In [GitLab 13.5](https://gitlab.com/gitlab-org/gitlab/-/issues/201938) and later, you
 can use [`when:manual`](#whenmanual) in the same job as `trigger`. In GitLab 13.4 and
 earlier, using them together causes the error `jobs:#{job-name} when should be on_success, on_failure or always`.
-It is deployed behind the `:ci_manual_bridges` [feature flag](../../user/feature_flags.md), which is **enabled by default**.
-[GitLab administrators with access to the Rails console](../../administration/feature_flags.md)
-can opt to disable it.
 
 #### Simple `trigger` syntax for multi-project pipelines
 

lib/gitlab/ci/features.rb

@@ -55,10 +55,6 @@ module Gitlab
         ::Feature.enabled?(:ci_trace_log_invalid_chunks, project, type: :ops, default_enabled: false)
       end
 
-      def self.manual_bridges_enabled?(project)
-        ::Feature.enabled?(:ci_manual_bridges, project, default_enabled: true)
-      end
-
       def self.auto_rollback_available?(project)
         ::Feature.enabled?(:cd_auto_rollback, project) && project&.feature_available?(:auto_rollback)
       end

spec/controllers/projects/jobs_controller_spec.rb

@@ -854,18 +854,6 @@ RSpec.describe Projects::JobsController, :clean_gitlab_redis_shared_state do
 
           expect(job.reload).to be_pending
         end
-
-        context 'when FF ci_manual_bridges is disabled' do
-          before do
-            stub_feature_flags(ci_manual_bridges: false)
-          end
-
-          it 'returns 404' do
-            post_play
-
-            expect(response).to have_gitlab_http_status(:not_found)
-          end
-        end
       end
     end
 

spec/models/ci/bridge_spec.rb

@@ -330,14 +330,6 @@ RSpec.describe Ci::Bridge do
       subject { build_stubbed(:ci_bridge, :manual).playable? }
 
       it { is_expected.to be_truthy }
-
-      context 'when FF ci_manual_bridges is disabled' do
-        before do
-          stub_feature_flags(ci_manual_bridges: false)
-        end
-
-        it { is_expected.to be_falsey }
-      end
     end
 
     context 'when build is not a manual action' do
@@ -352,14 +344,6 @@ RSpec.describe Ci::Bridge do
       subject { build_stubbed(:ci_bridge, :manual).action? }
 
       it { is_expected.to be_truthy }
-
-      context 'when FF ci_manual_bridges is disabled' do
-        before do
-          stub_feature_flags(ci_manual_bridges: false)
-        end
-
-        it { is_expected.to be_falsey }
-      end
     end
 
     context 'when build is not a manual action' do