Commit 5697b480 authored by Kerri Miller's avatar Kerri Miller

Merge branch 'remove-sidekiq-argument' into 'master'

Stop using argument in perform_async

See merge request gitlab-org/gitlab!43303
parents 3ae04e5c 40a4ab0a
......@@ -20,7 +20,7 @@ module IntegrationsActions
respond_to do |format|
format.html do
if saved
PropagateIntegrationWorker.perform_async(integration.id, false)
PropagateIntegrationWorker.perform_async(integration.id)
redirect_to scoped_edit_integration_path(integration), notice: success_message
else
render 'shared/integrations/edit'
......
......@@ -7,7 +7,8 @@ class PropagateIntegrationWorker
idempotent!
loggable_arguments 1
# Keep overwrite parameter for backwards compatibility.
# TODO: Keep overwrite parameter for backwards compatibility. Remove after >= 14.0
# https://gitlab.com/gitlab-org/gitlab/-/issues/255382
def perform(integration_id, overwrite = nil)
Admin::PropagateIntegrationService.propagate(Service.find(integration_id))
end
......
......@@ -55,7 +55,7 @@ RSpec.describe Admin::IntegrationsController do
end
it 'calls to PropagateIntegrationWorker' do
expect(PropagateIntegrationWorker).to have_received(:perform_async).with(integration.id, false)
expect(PropagateIntegrationWorker).to have_received(:perform_async).with(integration.id)
end
end
......
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