Merge branch 'master' into diff-line-comment-vuejs

# Conflicts:
#	app/models/discussion.rb
#	db/schema.rb

1 files changed, 10 insertions, 0 deletions

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 5075076c27b..c9d4c4dd03b 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -47,6 +47,16 @@ class Ability
       end
     end
 
+    # Returns an Array of Issues that can be read by the given user.
+    #
+    # issues - The issues to reduce down to those readable by the user.
+    # user - The User for which to check the issues
+    def issues_readable_by_user(issues, user = nil)
+      return issues if user && user.admin?
+
+      issues.select { |issue| issue.visible_to_user?(user) }
+    end
+
     # List of possible abilities for anonymous user
     def anonymous_abilities(user, subject)
       if subject.is_a?(PersonalSnippet)