summaryrefslogtreecommitdiff
path: root/app/models/project_services
diff options
context:
space:
mode:
authorBrett Walker <bwalker@gitlab.com>2019-08-15 17:37:36 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-08-15 17:37:36 +0000
commit3489dc3d7277bf478f68e1b3e0353b702f652acc (patch)
tree896dc6ef08d8347e992365594ce7c4b0d49e6ee4 /app/models/project_services
parent23754943a7ec119f123694a93c79fc07c32b7ba5 (diff)
downloadgitlab-ce-3489dc3d7277bf478f68e1b3e0353b702f652acc.tar.gz
Allow disabling group/project email notifications
- Adds UI to configure in group and project settings - Removes notification configuration for users when disabled at group or project level
Diffstat (limited to 'app/models/project_services')
-rw-r--r--app/models/project_services/emails_on_push_service.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/project_services/emails_on_push_service.rb b/app/models/project_services/emails_on_push_service.rb
index 45de64a9990..8ca40138a8f 100644
--- a/app/models/project_services/emails_on_push_service.rb
+++ b/app/models/project_services/emails_on_push_service.rb
@@ -24,6 +24,7 @@ class EmailsOnPushService < Service
def execute(push_data)
return unless supported_events.include?(push_data[:object_kind])
+ return if project.emails_disabled?
EmailsOnPushWorker.perform_async(
project_id,