Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 14 deletions

diff --git a/app/services/event_create_service.rb b/app/services/event_create_service.rb
index b755f512772..1a4e691a059 100644
--- a/app/services/event_create_service.rb
+++ b/app/services/event_create_service.rb
@@ -100,8 +100,10 @@ class EventCreateService
     end
   end
 
-  def join_project(project, current_user)
-    create_event(project, current_user, :joined)
+  def join_source(source, current_user)
+    return unless source.is_a?(Project)
+
+    create_event(source, current_user, :joined)
   end
 
   def leave_project(project, current_user)
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index ff712d78c8b..14fddba1cc0 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -526,6 +526,19 @@ class NotificationService
     mailer.member_invited_email(member.real_source_type, member.id, token).deliver_later
   end
 
+  def new_member(member)
+    notifiable_options = case member.source
+                         when Group
+                           {}
+                         when Project
+                           { skip_read_ability: true }
+                         end
+
+    return true unless member.notifiable?(:mention, notifiable_options)
+
+    mailer.member_access_granted_email(member.real_source_type, member.id).deliver_later
+  end
+
   def accept_project_invite(project_member)
     return true unless project_member.notifiable?(:subscription)
 
@@ -545,12 +558,6 @@ class NotificationService
     mailer.member_expiration_date_updated_email(member.real_source_type, member.id).deliver_later
   end
 
-  def new_project_member(project_member)
-    return true unless project_member.notifiable?(:mention, skip_read_ability: true)
-
-    mailer.member_access_granted_email(project_member.real_source_type, project_member.id).deliver_later
-  end
-
   def member_about_to_expire(member)
     return true unless member.notifiable?(:mention)
 
@@ -565,12 +572,6 @@ class NotificationService
     mailer.member_invite_accepted_email(group_member.real_source_type, group_member.id).deliver_later
   end
 
-  def new_group_member(group_member)
-    return true unless group_member.notifiable?(:mention)
-
-    mailer.member_access_granted_email(group_member.real_source_type, group_member.id).deliver_later
-  end
-
   def project_was_moved(project, old_path_with_namespace)
     recipients = project_moved_recipients(project)
     recipients = notifiable_users(recipients, :custom, custom_action: :moved_project, project: project)