diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/views/devise/mailer | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/views/devise/mailer')
| -rw-r--r-- | app/views/devise/mailer/password_change_by_admin.html.haml | 6 | ||||
| -rw-r--r-- | app/views/devise/mailer/password_change_by_admin.text.erb | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/views/devise/mailer/password_change_by_admin.html.haml b/app/views/devise/mailer/password_change_by_admin.html.haml new file mode 100644 index 00000000000..d72f36838c5 --- /dev/null +++ b/app/views/devise/mailer/password_change_by_admin.html.haml @@ -0,0 +1,6 @@ += email_default_heading(say_hello(@resource)) + +%p + = admin_changed_password_text(format: :html) +%p + = contact_your_administrator_text diff --git a/app/views/devise/mailer/password_change_by_admin.text.erb b/app/views/devise/mailer/password_change_by_admin.text.erb new file mode 100644 index 00000000000..d0e7ab98641 --- /dev/null +++ b/app/views/devise/mailer/password_change_by_admin.text.erb @@ -0,0 +1,5 @@ +<%= say_hello(@resource) %> + +<%= admin_changed_password_text %> + +<%= contact_your_administrator_text %> |