diff --git a/app/services/merge_requests/handle_assignees_change_service.rb b/app/services/merge_requests/handle_assignees_change_service.rb index a8d122fb71f2d5898b06b1136f9f734c34f7db9a..9ac386110f7895a76536ea0c109aa46a39c48fd8 100644 --- a/app/services/merge_requests/handle_assignees_change_service.rb +++ b/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 = {}) diff --git a/app/services/merge_requests/resolve_todos_service.rb b/app/services/merge_requests/resolve_todos_service.rb index 0010b596eee775b4a159cce26fa9baaa1caa8b90..2d322a7de309fc1b3a7275fd134e7470dbd6cc78 100644 --- a/app/services/merge_requests/resolve_todos_service.rb +++ b/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 diff --git a/changelogs/unreleased/20827-remove-update-mr-ffs.yml b/changelogs/unreleased/20827-remove-update-mr-ffs.yml new file mode 100644 index 0000000000000000000000000000000000000000..8ea9cd48ab3c8a19e2c13ed21d454ad6b97e430c --- /dev/null +++ b/changelogs/unreleased/20827-remove-update-mr-ffs.yml @@ -0,0 +1,5 @@ +--- +title: Remove update merge request related feature flags +merge_request: 61569 +author: +type: other diff --git a/config/feature_flags/development/async_handle_merge_request_assignees_change.yml b/config/feature_flags/development/async_handle_merge_request_assignees_change.yml deleted file mode 100644 index b44ccb1bd6e10c9e9f6a9f8e924bb0b0d4dfd50a..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/async_handle_merge_request_assignees_change.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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 diff --git a/config/feature_flags/development/resolve_merge_request_todos_async.yml b/config/feature_flags/development/resolve_merge_request_todos_async.yml deleted file mode 100644 index db19e43999484fc8348b5a23ed9001d4e88ed607..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/resolve_merge_request_todos_async.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: resolve_merge_request_todos_async -introduced_by_url: -rollout_issue_url: -milestone: '13.11' -type: development -group: group::code review -default_enabled: false diff --git a/spec/services/merge_requests/handle_assignees_change_service_spec.rb b/spec/services/merge_requests/handle_assignees_change_service_spec.rb index cb4bda0442e7c759b96bf65ca76b64948aca4344..0bf18f16abb4947fc9fd50f36d64e8b889bead01 100644 --- a/spec/services/merge_requests/handle_assignees_change_service_spec.rb +++ b/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 diff --git a/spec/services/merge_requests/resolve_todos_service_spec.rb b/spec/services/merge_requests/resolve_todos_service_spec.rb index 3e6f2ea3f5df9f426180499714e22763dbb027d4..53bd259f0f4a1b87e5e4cf9ec3f6c9e101f2106e 100644 --- a/spec/services/merge_requests/resolve_todos_service_spec.rb +++ b/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