diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/helpers/emails_helper.rb | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/helpers/emails_helper.rb')
-rw-r--r-- | app/helpers/emails_helper.rb | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb index b804efb9561..79b04ae0e2b 100644 --- a/app/helpers/emails_helper.rb +++ b/app/helpers/emails_helper.rb @@ -206,6 +206,23 @@ module EmailsHelper end end + def new_email_address_added_text(email) + _('A new email address has been added to your GitLab account: %{email}') % { email: email } + end + + def remove_email_address_text(format: nil) + url = profile_emails_url + + case format + when :html + settings_link_to = generate_link(_('email address settings'), url).html_safe + _("If you want to remove this email address, visit the %{settings_link_to} page.").html_safe % { settings_link_to: settings_link_to } + else + _('If you want to remove this email address, visit %{profile_link}') % + { profile_link: url } + end + end + def admin_changed_password_text(format: nil) url = Gitlab.config.gitlab.url |