Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 0 deletions

diff --git a/app/finders/issues_finder.rb b/app/finders/issues_finder.rb
index 5c9010ee3e0..fbf71a24f7e 100644
--- a/app/finders/issues_finder.rb
+++ b/app/finders/issues_finder.rb
@@ -47,6 +47,15 @@ class IssuesFinder < IssuableFinder
   # rubocop: disable CodeReuse/ActiveRecord
   def with_confidentiality_access_check
     return Issue.all if params.user_can_see_all_confidential_issues?
+
+    if Feature.enabled?(:optimize_issue_filter_assigned_to_self, default_enabled: :yaml)
+      # 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)
+    end
+
     return Issue.where('issues.confidential IS NOT TRUE') if params.user_cannot_see_confidential_issues?
 
     Issue.where('