Merge branch '20827-remove-update-mr-ffs' into 'master'

Remove update merge request related feature flags [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!61569

app/services/merge_requests/handle_assignees_change_service.rb

@@ -3,17 +3,13 @@
 module MergeRequests
   class HandleAssigneesChangeService < MergeRequests::BaseService
     def async_execute(merge_request, old_assignees, options = {})
-      if Feature.enabled?(:async_handle_merge_request_assignees_change, merge_request.target_project, default_enabled: :yaml)
-        MergeRequests::HandleAssigneesChangeWorker
-          .perform_async(
-            merge_request.id,
-            current_user.id,
-            old_assignees.map(&:id),
-            options
-          )
-      else
-        execute(merge_request, old_assignees, options)
-      end
+      MergeRequests::HandleAssigneesChangeWorker
+        .perform_async(
+          merge_request.id,
+          current_user.id,
+          old_assignees.map(&:id),
+          options
+        )
     end
 
     def execute(merge_request, old_assignees, options = {})

app/services/merge_requests/resolve_todos_service.rb

@@ -10,11 +10,7 @@ module MergeRequests
     end
 
     def async_execute
-      if Feature.enabled?(:resolve_merge_request_todos_async, merge_request.target_project, default_enabled: :yaml)
-        MergeRequests::ResolveTodosWorker.perform_async(merge_request.id, user.id)
-      else
-        execute
-      end
+      MergeRequests::ResolveTodosWorker.perform_async(merge_request.id, user.id)
     end
 
     def execute

changelogs/unreleased/20827-remove-update-mr-ffs.yml

+---
+title: Remove update merge request related feature flags
+merge_request: 61569
+author:
+type: other

config/feature_flags/development/async_handle_merge_request_assignees_change.yml

----
-name: async_handle_merge_request_assignees_change
-introduced_by_url:
-rollout_issue_url:
-milestone: '13.11'
-type: development
-group: group::code review
-default_enabled: false

config/feature_flags/development/resolve_merge_request_todos_async.yml

----
-name: resolve_merge_request_todos_async
-introduced_by_url:
-rollout_issue_url:
-milestone: '13.11'
-type: development
-group: group::code review
-default_enabled: false

spec/services/merge_requests/handle_assignees_change_service_spec.rb

@@ -38,18 +38,6 @@ RSpec.describe MergeRequests::HandleAssigneesChangeService do
 
       async_execute
     end
-
-    context 'when async_handle_merge_request_assignees_change feature is disabled' do
-      before do
-        stub_feature_flags(async_handle_merge_request_assignees_change: false)
-      end
-
-      it 'calls #execute' do
-        expect(service).to receive(:execute).with(merge_request, old_assignees, options)
-
-        async_execute
-      end
-    end
   end
 
   describe '#execute' do

spec/services/merge_requests/resolve_todos_service_spec.rb

@@ -23,18 +23,6 @@ RSpec.describe MergeRequests::ResolveTodosService do
 
       async_execute
     end
-
-    context 'when resolve_merge_request_todos_async feature is disabled' do
-      before do
-        stub_feature_flags(resolve_merge_request_todos_async: false)
-      end
-
-      it 'calls #execute' do
-        expect(service).to receive(:execute)
-
-        async_execute
-      end
-    end
   end
 
   describe '#execute' do