diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-07-23 14:09:28 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-07-23 14:09:28 +0000 |
| commit | c404c57fb8b5a6ca174e6fccb25cf057549a7a6f (patch) | |
| tree | 9c1f298b64edb362b4c13d9e0754e08921e3e82e /app/services | |
| parent | 6ee5f089a72c309827aac768c94e79481bc19b5f (diff) | |
| parent | 40d6d5e2d0123f1417bb5d3d1ead47bd525f8dac (diff) | |
| download | gitlab-ce-c404c57fb8b5a6ca174e6fccb25cf057549a7a6f.tar.gz | |
Merge branch '63485-fix-pipeline-emails-to-use-group-setting' into 'master'
Make pipeline emails respect group email setting
Closes #63485
See merge request gitlab-org/gitlab-ce!30907
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/notification_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index 5aa804666f0..a55771ed538 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -418,7 +418,9 @@ class NotificationService [pipeline.user], :watch, custom_action: :"#{pipeline.status}_pipeline", target: pipeline - ).map(&:notification_email) + ).map do |user| + user.notification_email_for(pipeline.project.group) + end if recipients.any? mailer.public_send(email_template, pipeline, recipients).deliver_later |