diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-30 06:09:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-30 06:09:16 +0300 |
commit | 2135111f19c8dce60f4956e460ad2d6e81f83e4b (patch) | |
tree | 50a5fc7530f8cc3827c44f1eadd83b7332440641 /spec/helpers | |
parent | b8ea3b335ec4b0984e8047c76e218a90fc9a9c5e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/profiles_helper_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/helpers/profiles_helper_spec.rb b/spec/helpers/profiles_helper_spec.rb index 7a941549d56..c015937c299 100644 --- a/spec/helpers/profiles_helper_spec.rb +++ b/spec/helpers/profiles_helper_spec.rb @@ -13,7 +13,8 @@ RSpec.describe ProfilesHelper do private_email = user.private_commit_email emails = [ - ["Use a private email - #{private_email}", Gitlab::PrivateCommitEmail::TOKEN], + [s_('Use primary email (%{email})') % { email: user.email }, ''], + [s_("Profiles|Use a private email - %{email}").html_safe % { email: private_email }, Gitlab::PrivateCommitEmail::TOKEN], user.email, confirmed_email1.email, confirmed_email2.email |