Merge branch 'jswain_almost_there' into 'master'

Improve the "Almost Finished" page

See merge request gitlab-org/gitlab!63704

app/controllers/confirmations_controller.rb

@@ -13,7 +13,7 @@ class ConfirmationsController < Devise::ConfirmationsController
   protected
 
   def after_resending_confirmation_instructions_path_for(resource)
-    return users_almost_there_path unless Feature.enabled?(:soft_email_confirmation)
+    return users_almost_there_path(email: resource.email) unless Feature.enabled?(:soft_email_confirmation)
 
     stored_location_for(resource) || dashboard_projects_path
   end

app/controllers/registrations/welcome_controller.rb

@@ -52,7 +52,7 @@ module Registrations
     end
 
     def path_for_signed_in_user(user)
-      return users_almost_there_path if requires_confirmation?(user)
+      return users_almost_there_path(email: user.email) if requires_confirmation?(user)
 
       stored_location_for(user) || members_activity_path(user.members)
     end

app/controllers/registrations_controller.rb

@@ -101,7 +101,7 @@ class RegistrationsController < Devise::RegistrationsController
     Gitlab::AppLogger.info(user_created_message)
     return new_user_session_path(anchor: 'login-pane') if resource.blocked_pending_approval?
 
-    Feature.enabled?(:soft_email_confirmation) ? dashboard_projects_path : users_almost_there_path
+    Feature.enabled?(:soft_email_confirmation) ? dashboard_projects_path : users_almost_there_path(email: resource.email)
   end
 
   private

app/views/devise/confirmations/almost_there.haml

+- user_email = "(#{params[:email]})" if params[:email].present?
+
 .well-confirmation.gl-text-center.gl-mb-6
   %h1.gl-mt-0
     = _("Almost there...")
   %p.lead.gl-mb-6
-    = _("Please check your email to confirm your account")
+    = _('Please check your email %{email} to confirm your account') % { email: user_email }
   %hr
 - if Gitlab::CurrentSettings.after_sign_up_text.present?
   .well-confirmation.gl-text-center
@@ -10,5 +12,5 @@
 %p.text-center
   = _("No confirmation email received? Please check your spam folder or")
 .gl-mb-6.prepend-top-20.gl-text-center
-  %a.btn.gl-button.btn-confirm{ href: new_user_confirmation_path }
+  %a.gl-link{ href: new_user_confirmation_path }
     = _("Request new confirmation email")

locale/gitlab.pot

@@ -24452,10 +24452,10 @@ msgstr ""
 msgid "Please check the configuration file to ensure that it is available and the YAML is valid"
 msgstr ""
 
-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}."
+msgid "Please check your email %{email} to confirm your account"
 msgstr ""
 
-msgid "Please check your email to confirm your account"
+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 ""
 
 msgid "Please choose a file"

spec/features/users/signup_spec.rb

@@ -204,7 +204,7 @@ RSpec.describe 'Signup' do
 
           expect { click_button 'Register' }.to change { User.count }.by(1)
           expect(current_path).to eq users_almost_there_path
-          expect(page).to have_content('Please check your email to confirm your account')
+          expect(page).to have_content("Please check your email (#{new_user.email}) to confirm your account")
 
           confirm_email