Commit 390f78a2 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'ash.mckenzie/fix-rails-sidekiq-rails-module-namespacing' into 'master'

Ensure when accessing Rails, we really get ::Rails (and not Sidekiq::Rails)

See merge request gitlab-org/gitlab-ce!18730
parents 4bf47cd7 af943264
...@@ -27,7 +27,7 @@ module Sidekiq ...@@ -27,7 +27,7 @@ module Sidekiq
Use an `after_commit` hook, or include `AfterCommitQueue` and use a `run_after_commit` block instead. Use an `after_commit` hook, or include `AfterCommitQueue` and use a `run_after_commit` block instead.
MSG MSG
rescue Sidekiq::Worker::EnqueueFromTransactionError => e rescue Sidekiq::Worker::EnqueueFromTransactionError => e
Rails.logger.error(e.message) if Rails.env.production? ::Rails.logger.error(e.message) if ::Rails.env.production?
Gitlab::Sentry.track_exception(e) Gitlab::Sentry.track_exception(e)
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