Commit 935385f6 authored by Kerri Miller's avatar Kerri Miller

Merge branch '338707-fix-temporary-rescue-in-export-memberships-worker' into 'master'

Fix use of Raven optional attributes

See merge request gitlab-org/gitlab!69116
parents 693e2918 7efdab8f
...@@ -19,7 +19,7 @@ module Groups ...@@ -19,7 +19,7 @@ module Groups
rescue Module::DelegationError => exception rescue Module::DelegationError => exception
# TEMPORARY: Rescue when a User record is not available, # TEMPORARY: Rescue when a User record is not available,
# see https://gitlab.com/gitlab-org/gitlab/-/issues/338707 # see https://gitlab.com/gitlab-org/gitlab/-/issues/338707
Raven.capture_exception(exception, group_id: @group.id, user_id: @current_user.id) Raven.capture_exception(exception, tags: { group_id: @group.id, user_id: @current_user.id })
end end
private private
......
...@@ -29,7 +29,7 @@ RSpec.describe Groups::ExportMembershipsWorker do ...@@ -29,7 +29,7 @@ RSpec.describe Groups::ExportMembershipsWorker do
it 'rescues the exception' do it 'rescues the exception' do
expect(Notify).not_to receive(:memberships_export_email) expect(Notify).not_to receive(:memberships_export_email)
expect(Raven).to receive(:capture_exception) expect(Raven).to receive(:capture_exception).and_call_original
worker.perform(group.id, user.id) worker.perform(group.id, user.id)
end end
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