diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-04 17:55:05 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-04 17:55:05 +0300 |
| commit | 390f78a2ba948fb4ca11dc8faa8beaa63a4c3ea8 (patch) | |
| tree | a0faba38f92f1a8d6c0ce65128fc5216d78a7e89 /config | |
| parent | 4bf47cd76fd69a26b7b2b4ac029f088ec5493712 (diff) | |
| parent | af9432643dd49fde165cf2dd2bdfb956c5cbfddf (diff) | |
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
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/forbid_sidekiq_in_transactions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/forbid_sidekiq_in_transactions.rb b/config/initializers/forbid_sidekiq_in_transactions.rb index 4603123665d..deb94d7dbce 100644 --- a/config/initializers/forbid_sidekiq_in_transactions.rb +++ b/config/initializers/forbid_sidekiq_in_transactions.rb @@ -27,7 +27,7 @@ module Sidekiq Use an `after_commit` hook, or include `AfterCommitQueue` and use a `run_after_commit` block instead. MSG 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) end end |