diff options
author | Dennis Tang <dtang@gitlab.com> | 2018-05-11 18:42:20 +0200 |
---|---|---|
committer | Dennis Tang <dtang@gitlab.com> | 2018-05-11 18:42:20 +0200 |
commit | 2205ed4f07265a43d2561ab2657557e317e7b9c0 (patch) | |
tree | 08e8373f874b59e78d97dd87b1c687d3458823d9 /config/initializers/forbid_sidekiq_in_transactions.rb | |
parent | 3a3f4a348be936abde6881fc3909026932bf97ab (diff) | |
parent | f4e234d92a2ff31dc681d56b52e9fbbbe3f931b1 (diff) | |
download | gitlab-ce-2205ed4f07265a43d2561ab2657557e317e7b9c0.tar.gz |
Merge remote-tracking branch 'origin/master' into 38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster
Diffstat (limited to 'config/initializers/forbid_sidekiq_in_transactions.rb')
-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 |