summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-06 00:07:48 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-06 00:07:48 +0000
commit2349eabc1a473bfb70555f0ce6d3d808cecb181d (patch)
tree0dae6a2a6810f2198eed42b7f9566ebf9c292468 /app/mailers
parent134fe182008dc13a16f12d723aa73771efb1a6a2 (diff)
downloadgitlab-ce-2349eabc1a473bfb70555f0ce6d3d808cecb181d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/profile.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/mailers/emails/profile.rb b/app/mailers/emails/profile.rb
index 2ea1aea1f51..c368e6c8ac7 100644
--- a/app/mailers/emails/profile.rb
+++ b/app/mailers/emails/profile.rb
@@ -34,3 +34,5 @@ module Emails
# rubocop: enable CodeReuse/ActiveRecord
end
end
+
+Emails::Profile.prepend_if_ee('EE::Emails::Profile')