diff --git a/app/workers/pipeline_hooks_worker.rb b/app/workers/pipeline_hooks_worker.rb index 97e6adbbf18254db64b14d75064762e94dac31db..40d138752b4f94bfcca5a6a486b93602031e5901 100644 --- a/app/workers/pipeline_hooks_worker.rb +++ b/app/workers/pipeline_hooks_worker.rb @@ -8,7 +8,7 @@ class PipelineHooksWorker # rubocop:disable Scalability/IdempotentWorker queue_namespace :pipeline_hooks worker_resource_boundary :cpu - data_consistency :delayed, feature_flag: :load_balancing_for_pipeline_hooks_worker + data_consistency :delayed # rubocop: disable CodeReuse/ActiveRecord def perform(pipeline_id) diff --git a/config/feature_flags/development/load_balancing_for_pipeline_hooks_worker.yml b/config/feature_flags/development/load_balancing_for_pipeline_hooks_worker.yml deleted file mode 100644 index 8e1794631f528604a6c41d67ac1b8f8d4abcda12..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/load_balancing_for_pipeline_hooks_worker.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: load_balancing_for_pipeline_hooks_worker -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62104 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331424 -milestone: '14.0' -type: development -group: group::memory -default_enabled: false diff --git a/spec/workers/pipeline_hooks_worker_spec.rb b/spec/workers/pipeline_hooks_worker_spec.rb index 5957b355c8e7ae4f61fde34ca722b98c00f8c7f4..0ed00c0c66afe0107dc089244d0ba7798ef8217c 100644 --- a/spec/workers/pipeline_hooks_worker_spec.rb +++ b/spec/workers/pipeline_hooks_worker_spec.rb @@ -25,6 +25,5 @@ it_behaves_like 'worker with data consistency', described_class, - feature_flag: :load_balancing_for_pipeline_hooks_worker, data_consistency: :delayed end