Commit e5962071 authored by Patrick Bajao's avatar Patrick Bajao

Remove update merge request related feature flags

Removes the following feature flags:
- async_handle_merge_request_assignees_change
- resolve_merge_request_todos_async

These flags were enabled for everyone on GitLab.com for 24 hours
and the workers are performing and working fine.

Changelog: other
parent 052a7e86
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
module MergeRequests module MergeRequests
class HandleAssigneesChangeService < MergeRequests::BaseService class HandleAssigneesChangeService < MergeRequests::BaseService
def async_execute(merge_request, old_assignees, options = {}) 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 MergeRequests::HandleAssigneesChangeWorker
.perform_async( .perform_async(
merge_request.id, merge_request.id,
...@@ -11,9 +10,6 @@ module MergeRequests ...@@ -11,9 +10,6 @@ module MergeRequests
old_assignees.map(&:id), old_assignees.map(&:id),
options options
) )
else
execute(merge_request, old_assignees, options)
end
end end
def execute(merge_request, old_assignees, options = {}) def execute(merge_request, old_assignees, options = {})
......
...@@ -10,11 +10,7 @@ module MergeRequests ...@@ -10,11 +10,7 @@ module MergeRequests
end end
def async_execute 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) MergeRequests::ResolveTodosWorker.perform_async(merge_request.id, user.id)
else
execute
end
end end
def execute def execute
......
---
title: Remove update merge request related feature flags
merge_request: 61569
author:
type: other
---
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
---
name: resolve_merge_request_todos_async
introduced_by_url:
rollout_issue_url:
milestone: '13.11'
type: development
group: group::code review
default_enabled: false
...@@ -38,18 +38,6 @@ RSpec.describe MergeRequests::HandleAssigneesChangeService do ...@@ -38,18 +38,6 @@ RSpec.describe MergeRequests::HandleAssigneesChangeService do
async_execute async_execute
end 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 end
describe '#execute' do describe '#execute' do
......
...@@ -23,18 +23,6 @@ RSpec.describe MergeRequests::ResolveTodosService do ...@@ -23,18 +23,6 @@ RSpec.describe MergeRequests::ResolveTodosService do
async_execute async_execute
end 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 end
describe '#execute' do describe '#execute' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment