Merge branch '39366-email-confirmation-fails' into 'master'

grab the correct username when confirming secondary email

Closes #39366

See merge request gitlab-org/gitlab-ce!15010

app/controllers/confirmations_controller.rb

@@ -10,7 +10,7 @@ class ConfirmationsController < Devise::ConfirmationsController
     users_almost_there_path
   end
 
-  def after_confirmation_path_for(_resource_name, resource)
+  def after_confirmation_path_for(resource_name, resource)
     # incoming resource can either be a :user or an :email
     if signed_in?(:user)
       after_sign_in(resource)

app/models/email.rb

@@ -14,6 +14,8 @@ class Email < ActiveRecord::Base
   devise :confirmable
   self.reconfirmable = false  # currently email can't be changed, no need to reconfirm
 
+  delegate :username, to: :user
+
   def email=(value)
     write_attribute(:email, value.downcase.strip)
   end

changelogs/unreleased/39366-email-confirmation-fails.yml

+---
+title: 'Fix bug preventing secondary emails from being confirmed'
+merge_request: 15010
+author:
+type: fixed

spec/models/email_spec.rb

@@ -40,4 +40,12 @@ describe Email do
       expect(user.emails.confirmed.count).to eq 1
     end
   end
+
+  describe 'delegation' do
+    let(:user) { create(:user) }
+
+    it 'delegates to :user' do
+      expect(build(:email, user: user).username).to eq user.username
+    end
+  end
 end