Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-04 12:08:38 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-04 12:08:38 +0300
commit477c2c26047bc2d2da32b31eb8b26a6397675931 (patch)
treeac863e97c714d08c93267650ba60af613f5777ae /app/mailers
parent4be2167e71cf1b19a049fdced9356f311a364c7f (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/devise_mailer.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb
index cbaf53fced1..a02670aed90 100644
--- a/app/mailers/devise_mailer.rb
+++ b/app/mailers/devise_mailer.rb
@@ -9,6 +9,10 @@ class DeviseMailer < Devise::Mailer
helper EmailsHelper
helper ApplicationHelper
+ def password_change_by_admin(record, opts = {})
+ devise_mail(record, :password_change_by_admin, opts)
+ end
+
protected
def subject_for(key)