diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/mailers/devise_mailer.rb | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/mailers/devise_mailer.rb')
| -rw-r--r-- | app/mailers/devise_mailer.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb index a02670aed90..61a23520d54 100644 --- a/app/mailers/devise_mailer.rb +++ b/app/mailers/devise_mailer.rb @@ -13,6 +13,10 @@ class DeviseMailer < Devise::Mailer devise_mail(record, :password_change_by_admin, opts) end + def user_admin_approval(record, opts = {}) + devise_mail(record, :user_admin_approval, opts) + end + protected def subject_for(key) |