Commit 8686dca5 authored by nicolasdular's avatar nicolasdular

Update confirmation email warning copy

parent 9a4e2a4e
...@@ -19,7 +19,7 @@ module ConfirmEmailWarning ...@@ -19,7 +19,7 @@ module ConfirmEmailWarning
email = current_user.unconfirmed_email || current_user.email email = current_user.unconfirmed_email || current_user.email
flash.now[:warning] = _("Please check your email (%{email}) to verify that you own this address. Didn't receive it? %{resend_link}. Wrong email address? %{update_link}.").html_safe % { flash.now[:warning] = _("Please check your email (%{email}) to verify that you own this address and unlock the power of CI/CD. Didn't receive it? %{resend_link}. Wrong email address? %{update_link}.").html_safe % {
email: email, email: email,
resend_link: view_context.link_to(_('Resend it'), user_confirmation_path(user: { email: email }), method: :post), resend_link: view_context.link_to(_('Resend it'), user_confirmation_path(user: { email: email }), method: :post),
update_link: view_context.link_to(_('Update it'), profile_path) update_link: view_context.link_to(_('Update it'), profile_path)
......
...@@ -12196,7 +12196,7 @@ msgstr "" ...@@ -12196,7 +12196,7 @@ msgstr ""
msgid "Please check the configuration file to ensure that it is available and the YAML is valid" msgid "Please check the configuration file to ensure that it is available and the YAML is valid"
msgstr "" msgstr ""
msgid "Please check your email (%{email}) to verify that you own this address. Didn't receive it? %{resend_link}. Wrong email address? %{update_link}." msgid "Please check your email (%{email}) to verify that you own this address and unlock the power of CI/CD. Didn't receive it? %{resend_link}. Wrong email address? %{update_link}."
msgstr "" msgstr ""
msgid "Please choose a group URL with no special characters." msgid "Please choose a group URL with no special characters."
......
...@@ -19,7 +19,7 @@ describe ConfirmEmailWarning do ...@@ -19,7 +19,7 @@ describe ConfirmEmailWarning do
RSpec::Matchers.define :set_confirm_warning_for do |email| RSpec::Matchers.define :set_confirm_warning_for do |email|
match do |response| match do |response|
expect(response).to set_flash.now[:warning].to include("Please check your email (#{email}) to verify that you own this address.") expect(response).to set_flash.now[:warning].to include("Please check your email (#{email}) to verify that you own this address and unlock the power of CI/CD.")
end end
end end
......
...@@ -806,7 +806,7 @@ describe 'Login' do ...@@ -806,7 +806,7 @@ describe 'Login' do
gitlab_sign_in(user) gitlab_sign_in(user)
expect(current_path).to eq root_path expect(current_path).to eq root_path
expect(page).to have_content("Please check your email (#{user.email}) to verify that you own this address.") expect(page).to have_content("Please check your email (#{user.email}) to verify that you own this address and unlock the power of CI/CD.")
end end
context "when not having confirmed within Devise's allow_unconfirmed_access_for time" do context "when not having confirmed within Devise's allow_unconfirmed_access_for time" do
......
...@@ -222,7 +222,7 @@ shared_examples 'Signup' do ...@@ -222,7 +222,7 @@ shared_examples 'Signup' do
expect(current_path).to eq users_sign_up_welcome_path expect(current_path).to eq users_sign_up_welcome_path
else else
expect(current_path).to eq dashboard_projects_path expect(current_path).to eq dashboard_projects_path
expect(page).to have_content("Please check your email (#{new_user.email}) to verify that you own this address.") expect(page).to have_content("Please check your email (#{new_user.email}) to verify that you own this address and unlock the power of CI/CD.")
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment