diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 7caa2be78f21969d00f3b4f4e88929deaa13a8a7..3b5de9da8700a5dd18c781e7648a5c90d13adcfa 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -401,9 +401,7 @@ def show_merge_request # We need to handle the exception that the auto merge was missed # For example, the approval group was changed and now the approvals are passing - if Feature.enabled?(:process_auto_merge_on_load, @merge_request.project) && - @merge_request.auto_merge_enabled? && - @merge_request.mergeability_checks_pass? + if @merge_request.auto_merge_enabled? && @merge_request.mergeability_checks_pass? Gitlab::EventStore.publish( MergeRequests::MergeableEvent.new( data: { merge_request_id: @merge_request.id } diff --git a/config/feature_flags/gitlab_com_derisk/process_auto_merge_on_load.yml b/config/feature_flags/gitlab_com_derisk/process_auto_merge_on_load.yml deleted file mode 100644 index 1107a98c6c6ce565bc69e5b55135e217d3fa6a23..0000000000000000000000000000000000000000 --- a/config/feature_flags/gitlab_com_derisk/process_auto_merge_on_load.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: process_auto_merge_on_load -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/505934 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180367 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/517477 -milestone: '17.9' -group: group::code review -type: gitlab_com_derisk -default_enabled: false diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index d06b0fd585d2b159dc92692548c7912f590d9d76..795f005244473f33f0bbe285e4bcd4e7be5c69e8 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -103,16 +103,6 @@ def go(extra_params = {}) expect { go }.to publish_event(MergeRequests::MergeableEvent) .with(merge_request_id: merge_request.id) end - - context 'when process_auto_merge_on_load is off' do - before do - stub_feature_flags(process_auto_merge_on_load: false) - end - - it 'does not call the auto merge process worker' do - expect { go }.not_to publish_event(MergeRequests::MergeableEvent) - end - end end context 'when the merge request is not mergeable' do