diff options
Diffstat (limited to 'app/finders/issues_finder.rb')
| -rw-r--r-- | app/finders/issues_finder.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/finders/issues_finder.rb b/app/finders/issues_finder.rb index 5c9010ee3e0..e1a334413f8 100644 --- a/app/finders/issues_finder.rb +++ b/app/finders/issues_finder.rb @@ -47,6 +47,13 @@ class IssuesFinder < IssuableFinder # rubocop: disable CodeReuse/ActiveRecord def with_confidentiality_access_check return Issue.all if params.user_can_see_all_confidential_issues? + + # If already filtering by assignee we can skip confidentiality since a user + # can always see confidential issues assigned to them. This is just an + # optimization since a very common usecase of this Finder is to load the + # count of issues assigned to the user for the header bar. + return Issue.all if current_user && params.assignees.include?(current_user) + return Issue.where('issues.confidential IS NOT TRUE') if params.user_cannot_see_confidential_issues? Issue.where(' @@ -74,8 +81,7 @@ class IssuesFinder < IssuableFinder issues = super issues = by_due_date(issues) issues = by_confidential(issues) - issues = by_issue_types(issues) - issues + by_issue_types(issues) end def by_confidential(items) |