From 38737345abdf91ac2cb0b1cdff4eb7132b4104ee Mon Sep 17 00:00:00 2001
From: "http://jneen.net/" <jneen@jneen.net>
Date: Thu, 10 Aug 2017 10:41:25 -0700
Subject: [PATCH] skip the :read_project check for new_project_member

since we're just adding them as a member, the permission may still
return false.
---
 app/models/notification_recipient.rb | 7 ++++++-
 app/services/notification_service.rb | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/models/notification_recipient.rb b/app/models/notification_recipient.rb
index 30fab33e5e0..dc862565a71 100644
--- a/app/models/notification_recipient.rb
+++ b/app/models/notification_recipient.rb
@@ -6,7 +6,8 @@ class NotificationRecipient
     target: nil,
     acting_user: nil,
     project: nil,
-    group: nil
+    group: nil,
+    skip_read_ability: false
   )
     unless NotificationSetting.levels.key?(type) || type == :subscription
       raise ArgumentError, "invalid type: #{type.inspect}"
@@ -19,6 +20,7 @@ class NotificationRecipient
     @group = group || @project&.group
     @user = user
     @type = type
+    @skip_read_ability = skip_read_ability
   end
 
   def notification_setting
@@ -83,6 +85,8 @@ class NotificationRecipient
   def has_access?
     DeclarativePolicy.subject_scope do
       return false unless user.can?(:receive_notifications)
+      return true if @skip_read_ability
+
       return false if @project && !user.can?(:read_project, @project)
 
       return true unless read_ability
@@ -102,6 +106,7 @@ class NotificationRecipient
   private
 
   def read_ability
+    return nil if @skip_read_ability
     return @read_ability if instance_variable_defined?(:@read_ability)
 
     @read_ability =
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index d92282ac896..4267879b03d 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -244,7 +244,7 @@ class NotificationService
   end
 
   def new_project_member(project_member)
-    return true unless project_member.notifiable?(:mention)
+    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