diff options
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/members.rb | 6 | ||||
| -rw-r--r-- | app/mailers/emails/pipelines.rb | 21 |
2 files changed, 15 insertions, 12 deletions
diff --git a/app/mailers/emails/members.rb b/app/mailers/emails/members.rb index 6954fd46850..8a9ed557cc6 100644 --- a/app/mailers/emails/members.rb +++ b/app/mailers/emails/members.rb @@ -43,9 +43,13 @@ module Emails user = User.find(user_id) + @source_hidden = !member_source.readable_by?(user) + + human_name = @source_hidden ? 'Hidden' : member_source.human_name + member_email_with_layout( to: user.notification_email_for(notification_group), - subject: subject("Access to the #{member_source.human_name} #{member_source.model_name.singular} was denied")) + subject: subject("Access to the #{human_name} #{member_source.model_name.singular} was denied")) end def member_invited_email(member_source_type, member_id, token) diff --git a/app/mailers/emails/pipelines.rb b/app/mailers/emails/pipelines.rb index 1b27d062391..5363ad63771 100644 --- a/app/mailers/emails/pipelines.rb +++ b/app/mailers/emails/pipelines.rb @@ -2,21 +2,23 @@ module Emails module Pipelines - def pipeline_success_email(pipeline, recipients) - pipeline_mail(pipeline, recipients, 'Successful') + def pipeline_success_email(pipeline, recipient) + pipeline_mail(pipeline, recipient, 'Successful') end - def pipeline_failed_email(pipeline, recipients) - pipeline_mail(pipeline, recipients, 'Failed') + def pipeline_failed_email(pipeline, recipient) + pipeline_mail(pipeline, recipient, 'Failed') end - def pipeline_fixed_email(pipeline, recipients) - pipeline_mail(pipeline, recipients, 'Fixed') + def pipeline_fixed_email(pipeline, recipient) + pipeline_mail(pipeline, recipient, 'Fixed') end private - def pipeline_mail(pipeline, recipients, status) + def pipeline_mail(pipeline, recipient, status) + raise ArgumentError if recipient.is_a?(Array) + @project = pipeline.project @pipeline = pipeline @@ -28,10 +30,7 @@ module Emails add_headers - # We use bcc here because we don't want to generate these emails for a - # thousand times. This could be potentially expensive in a loop, and - # recipients would contain all project watchers so it could be a lot. - mail(bcc: recipients, + mail(to: recipient, subject: subject(pipeline_subject(status))) do |format| format.html { render layout: 'mailer' } format.text { render layout: 'mailer' } |