diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
| commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
| tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/mailers/devise_mailer.rb | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/mailers/devise_mailer.rb')
| -rw-r--r-- | app/mailers/devise_mailer.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb index 61a23520d54..7129e577cb8 100644 --- a/app/mailers/devise_mailer.rb +++ b/app/mailers/devise_mailer.rb @@ -17,6 +17,11 @@ class DeviseMailer < Devise::Mailer devise_mail(record, :user_admin_approval, opts) end + def reset_password_instructions(record, token, opts = {}) + headers['X-Mailgun-Suppressions-Bypass'] = 'true' + super + end + protected def subject_for(key) |