diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/mailers/emails/members.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/mailers/emails/members.rb')
-rw-r--r-- | app/mailers/emails/members.rb | 6 |
1 files changed, 5 insertions, 1 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) |