diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-14 13:57:40 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-14 13:57:40 +0000 |
| commit | 4533c28840d9a5dc01094a437d209c0a309e14ce (patch) | |
| tree | 232aa21ff49e4c68ec05618a33b37d3d31803af9 /app/models | |
| parent | a0c9ed3a22e5654c03606f95e1331665fae2cbd2 (diff) | |
| parent | ba3376f3796c434d4b8342c71bda8e580d923c0a (diff) | |
| download | gitlab-ce-4533c28840d9a5dc01094a437d209c0a309e14ce.tar.gz | |
Merge branch '37759-also-treat-newlines-as-separator' into 'master'
Treat newlines as separators for pipeline emails service
Closes #37759
See merge request gitlab-org/gitlab-ce!14250
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project_services/pipelines_email_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/pipelines_email_service.rb b/app/models/project_services/pipelines_email_service.rb index 9d37184be2c..6a3118a11b8 100644 --- a/app/models/project_services/pipelines_email_service.rb +++ b/app/models/project_services/pipelines_email_service.rb @@ -80,6 +80,6 @@ class PipelinesEmailService < Service end def retrieve_recipients(data) - recipients.to_s.split(',').reject(&:blank?) + recipients.to_s.split(/[,(?:\r?\n) ]+/).reject(&:empty?) end end |