Skip to content

Follow-up from "Fix deprecated DeliveryJob message

What does this MR do?

The extra check can be removed with 13.4 milestone

ActionMailer::DeliveryJob is deprecated, with rails 6 we use ActionMailer::MailDeliveryJob

We keep both checks in order to be safe with deploys with multiple code versions running

Testing

On my computer using gdk

  • I checked development.log
  • Created a note and check logs
[ActiveJob] [ActionMailer::MailDeliveryJob] [21634e80-9628-4eb5-ae8d-a26ecbd8deb3]   ↳ lib/banzai/filter/user_reference_filter.rb:85:in `namespaces'
[ActiveJob] [ActionMailer::MailDeliveryJob] [21634e80-9628-4eb5-ae8d-a26ecbd8deb3]   Rendered notify/_note_email.html.haml (Duration: 17.4ms | Allocations: 10629)
[ActiveJob] [ActionMailer::MailDeliveryJob] [21634e80-9628-4eb5-ae8d-a26ecbd8deb3]   Rendered notify/note_merge_request_email.html.haml within layouts/notify (Duration: 17.7ms | Allocations: 10751)

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

Closes #228580 (closed)

Edited by Alina Mihaila

Merge request reports