Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 5 deletions

diff --git a/app/services/users/email_verification/base_service.rb b/app/services/users/email_verification/base_service.rb
index 3337beec195..721290fe056 100644
--- a/app/services/users/email_verification/base_service.rb
+++ b/app/services/users/email_verification/base_service.rb
@@ -5,22 +5,23 @@ module Users
     class BaseService
       VALID_ATTRS = %i[unlock_token confirmation_token].freeze
 
-      def initialize(attr:)
+      def initialize(attr:, user:)
         @attr = attr
+        @user = user
 
         validate_attr!
       end
 
       protected
 
-      attr_reader :attr, :token
+      attr_reader :attr, :user, :token
 
       def validate_attr!
         raise ArgumentError, 'Invalid attribute' unless attr.in?(VALID_ATTRS)
       end
 
       def digest
-        Devise.token_generator.digest(User, attr, token)
+        Devise.token_generator.digest(User, user.email, token)
       end
     end
   end
diff --git a/app/services/users/email_verification/validate_token_service.rb b/app/services/users/email_verification/validate_token_service.rb
index b1b34e94f49..30413de805c 100644
--- a/app/services/users/email_verification/validate_token_service.rb
+++ b/app/services/users/email_verification/validate_token_service.rb
@@ -8,9 +8,8 @@ module Users
       TOKEN_VALID_FOR_MINUTES = 60
 
       def initialize(attr:, user:, token:)
-        super(attr: attr)
+        super(attr: attr, user: user)
 
-        @user = user
         @token = token
       end