diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-07 00:09:52 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-07 00:09:52 +0000 |
commit | cbb9c704ee65b439fa1646c86b78a1eb18d677fe (patch) | |
tree | 7f03e43731c23896c4d81fe968fee352779a4e53 /app | |
parent | d650b4f4c4a20f9d1801a0dc69bdc3e106a18e11 (diff) | |
download | gitlab-ce-cbb9c704ee65b439fa1646c86b78a1eb18d677fe.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-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) |