Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-07-07 15:09:35 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-07-07 15:09:35 +0300
commit2abeca2d92cfe3bc18441b63ca0c54af086b206e (patch)
tree72f02f9c0470b897f31c45a6b7ccce6fe57955b0 /app/services/members
parentf4a9d976cf03888fbfd81ab9813720f4e8ec8056 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/members')
-rw-r--r--app/services/members/creator_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/members/creator_service.rb b/app/services/members/creator_service.rb
index 217004e634d..cc69a1973af 100644
--- a/app/services/members/creator_service.rb
+++ b/app/services/members/creator_service.rb
@@ -256,7 +256,7 @@ module Members
if user_by_email
find_or_initialize_member_by_user(user_id: user_by_email.id)
else
- source.members.build(invite_email: invitee)
+ source.members_and_requesters.find_or_initialize_by(invite_email: invitee) # rubocop:disable CodeReuse/ActiveRecord
end
end