Comments on confidential issues doesn't show in activity feed to non-members

1 files changed, 6 insertions, 2 deletions

diff --git a/app/models/event.rb b/app/models/event.rb
index a5cfeaf388e..2b963d4f2f6 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -80,8 +80,8 @@ class Event < ActiveRecord::Base
       true
     elsif created_project?
       true
-    elsif issue?
-      Ability.abilities.allowed?(user, :read_issue, issue)
+    elsif issue? || issue_note?
+      Ability.abilities.allowed?(user, :read_issue, note? ? note_target : target)
     else
       ((merge_request? || note?) && target) || milestone?
     end
@@ -298,6 +298,10 @@ class Event < ActiveRecord::Base
     target.noteable_type == "Commit"
   end
 
+  def issue_note?
+    note? && target && target.noteable_type == "Issue"
+  end
+
   def note_project_snippet?
     target.noteable_type == "Snippet"
   end