Commit 07e89322 authored by Shinya Maeda's avatar Shinya Maeda

Merge branch 'if-ruby2.7_kwargs_in_forbid_sidekiq_in_transactions_initializer' into 'master'

Fix Ruby 2.7 kwargs deprecation warning in forbid_sidekiq_in_transactions initializer

See merge request gitlab-org/gitlab!44026
parents 1f53866f 91600cc0
...@@ -46,7 +46,7 @@ end ...@@ -46,7 +46,7 @@ end
module ActiveRecord module ActiveRecord
class Base class Base
module SkipTransactionCheckAfterCommit module SkipTransactionCheckAfterCommit
def committed!(*) def committed!(*args, **kwargs)
Sidekiq::Worker.skipping_transaction_check { super } Sidekiq::Worker.skipping_transaction_check { super }
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