Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 4 insertions, 5 deletions

diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 3e19f294253..995c26d7221 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -82,10 +82,6 @@ class ProjectMember < Member
     source
   end
 
-  def owner?
-    project.owner == user
-  end
-
   def notifiable_options
     { project: project }
   end
@@ -132,7 +128,10 @@ class ProjectMember < Member
   end
 
   def post_create_hook
-    unless owner?
+    # The creator of a personal project gets added as a `ProjectMember`
+    # with `OWNER` access during creation of a personal project,
+    # but we do not want to trigger notifications to the same person who created the personal project.
+    unless project.personal_namespace_holder?(user)
       event_service.join_project(self.project, self.user)
       run_after_commit_or_now { notification_service.new_project_member(self) }
     end