summaryrefslogtreecommitdiff
path: root/app/services/emails
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-13 13:26:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-13 13:26:31 +0000
commitb7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch)
tree5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /app/services/emails
parent25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff)
downloadgitlab-ce-b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/emails')
-rw-r--r--app/services/emails/create_service.rb2
-rw-r--r--app/services/emails/destroy_service.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb
index dc06a5caa40..473256d9c6f 100644
--- a/app/services/emails/create_service.rb
+++ b/app/services/emails/create_service.rb
@@ -11,3 +11,5 @@ module Emails
end
end
end
+
+Emails::CreateService.prepend_if_ee('EE::Emails::CreateService')
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb
index 9ca1a03e172..a0b43ad3d08 100644
--- a/app/services/emails/destroy_service.rb
+++ b/app/services/emails/destroy_service.rb
@@ -17,3 +17,5 @@ module Emails
end
end
end
+
+Emails::DestroyService.prepend_if_ee('EE::Emails::DestroyService')