diff --git a/app/workers/update_merge_requests_worker.rb b/app/workers/update_merge_requests_worker.rb index 5f7f1f612999f405ed42e3ef7f57c4d1b260a481..7771aa903634d3950e87107376e31f0d2ef0ead8 100644 --- a/app/workers/update_merge_requests_worker.rb +++ b/app/workers/update_merge_requests_worker.rb @@ -3,7 +3,7 @@ class UpdateMergeRequestsWorker # rubocop:disable Scalability/IdempotentWorker include ApplicationWorker - data_consistency :sticky, feature_flag: :update_merge_request_worker_sticky + data_consistency :sticky sidekiq_options retry: 3 diff --git a/config/feature_flags/worker/update_merge_request_worker_sticky.yml b/config/feature_flags/worker/update_merge_request_worker_sticky.yml deleted file mode 100644 index 3276e8b336e4c0a977ae5744788eaa97626c0876..0000000000000000000000000000000000000000 --- a/config/feature_flags/worker/update_merge_request_worker_sticky.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: update_merge_request_worker_sticky -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403184 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/171352 -rollout_issue_url: -milestone: '17.6' -group: group::code review -type: worker -default_enabled: false