Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

1 files changed, 4 insertions, 3 deletions

diff --git a/app/models/member.rb b/app/models/member.rb
index 397e60be3a8..beb4c05f2a6 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -147,7 +147,6 @@ class Member < ApplicationRecord
   scope :owners, -> { active.where(access_level: OWNER) }
   scope :owners_and_maintainers, -> { active.where(access_level: [OWNER, MAINTAINER]) }
   scope :with_user, -> (user) { where(user: user) }
-  scope :with_user_by_email, -> (email) { left_join_users.where(users: { email: email } ) }
 
   scope :preload_user_and_notification_settings, -> { preload(user: :notification_settings) }
 
@@ -278,12 +277,14 @@ class Member < ApplicationRecord
 
   def accept_invite!(new_user)
     return false unless invite?
+    return false unless new_user
+
+    self.user = new_user
+    return false unless self.user.save
 
     self.invite_token = nil
     self.invite_accepted_at = Time.current.utc
 
-    self.user = new_user
-
     saved = self.save
 
     after_accept_invite if saved