diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-04 21:08:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-04 21:08:48 +0300 |
commit | b3555357704e2776fc0c960eaf931b0e9b0f0ddf (patch) | |
tree | f51538bb1cd4b1fcb5981b38e31dc13d40381ff6 /lib/gitlab/marginalia | |
parent | adf76f8f1d6da3ecbd8aa5d2da68dc8456283e8f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/marginalia')
-rw-r--r-- | lib/gitlab/marginalia/comment.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/marginalia/comment.rb b/lib/gitlab/marginalia/comment.rb index d5dae5ef4b3..7b4e4b06f00 100644 --- a/lib/gitlab/marginalia/comment.rb +++ b/lib/gitlab/marginalia/comment.rb @@ -28,7 +28,7 @@ module Gitlab # We are using 'Marginalia::SidekiqInstrumentation' which does not support 'ActiveJob::Base'. # Gitlab also uses 'ActionMailer::MailDeliveryJob' which inherits from ActiveJob::Base. # So below condition is used to return metadata for such jobs. - if job.is_a?(ActionMailer::MailDeliveryJob) || job.is_a?(ActionMailer::DeliveryJob) + if job.is_a?(ActionMailer::MailDeliveryJob) { "class" => job.arguments.first, "jid" => job.job_id |