diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 21:10:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 21:10:55 +0300 |
| commit | 716896e8cac8a516cd36efada8c8c5f383b63f62 (patch) | |
| tree | cfa6c76580b2a3a1b48c0cb6bc9d9dc1caa211ab /app/mailers | |
| parent | 9b1b702f0fc3820e13fd3810bf096687d3378dc5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/members.rb | 2 | ||||
| -rw-r--r-- | app/mailers/previews/devise_mailer_preview.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/mailers/emails/members.rb b/app/mailers/emails/members.rb index 759181bd3cb..02726c4354e 100644 --- a/app/mailers/emails/members.rb +++ b/app/mailers/emails/members.rb @@ -147,3 +147,5 @@ module Emails end end end + +Emails::Members.prepend_if_ee('EE::Emails::Members') diff --git a/app/mailers/previews/devise_mailer_preview.rb b/app/mailers/previews/devise_mailer_preview.rb index 68f281f825e..2919d466073 100644 --- a/app/mailers/previews/devise_mailer_preview.rb +++ b/app/mailers/previews/devise_mailer_preview.rb @@ -31,6 +31,6 @@ class DeviseMailerPreview < ActionMailer::Preview private def unsaved_user - User.new(name: 'Jane Doe', email: 'jdoe@example.com') + User.new(name: 'Jane Doe', email: 'jdoe@example.com', created_at: 1.minute.ago) end end |