diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-21 15:09:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-21 15:09:34 +0300 |
commit | 79850719759d6fe1b0682fd27573d479c9013f03 (patch) | |
tree | bc0466515aca2c2db339cfe8e44d3c148804d304 /app/helpers/emails_helper.rb | |
parent | d05604c95aeed1e8bbf63abc0b363cb921f0996a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/emails_helper.rb')
-rw-r--r-- | app/helpers/emails_helper.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb index d5c22927991..0a0dc77e5e2 100644 --- a/app/helpers/emails_helper.rb +++ b/app/helpers/emails_helper.rb @@ -218,8 +218,28 @@ module EmailsHelper _('Please contact your administrator with any questions.') end + def change_reviewer_notification_text(new_reviewers, previous_reviewers, html_tag = nil) + new = new_reviewers.any? ? users_to_sentence(new_reviewers) : s_('ChangeReviewer|Unassigned') + old = previous_reviewers.any? ? users_to_sentence(previous_reviewers) : nil + + if html_tag.present? + new = content_tag(html_tag, new) + old = content_tag(html_tag, old) if old.present? + end + + if old.present? + s_('ChangeReviewer|Reviewer changed from %{old} to %{new}').html_safe % { old: old, new: new } + else + s_('ChangeReviewer|Reviewer changed to %{new}').html_safe % { new: new } + end + end + private + def users_to_sentence(users) + sanitize_name(users.map(&:name).to_sentence) + end + def generate_link(text, url) link_to(text, url, target: :_blank, rel: 'noopener noreferrer') end |