Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 33 insertions, 28 deletions

diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb
index 9ef067e8797..4f61e5ed711 100644
--- a/app/controllers/concerns/issuable_collections.rb
+++ b/app/controllers/concerns/issuable_collections.rb
@@ -81,34 +81,36 @@ module IssuableCollections
 
   # rubocop:disable Gitlab/ModuleWithInstanceVariables
   def finder_options
-    params[:state] = default_state if params[:state].blank?
-
-    options = {
-      scope: params[:scope],
-      state: params[:state],
-      confidential: Gitlab::Utils.to_boolean(params[:confidential]),
-      sort: set_sort_order
-    }
-
-    # Used by view to highlight active option
-    @sort = options[:sort]
-
-    # When a user looks for an exact iid, we do not filter by search but only by iid
-    if params[:search] =~ /^#(?<iid>\d+)\z/
-      options[:iids] = Regexp.last_match[:iid]
-      params[:search] = nil
+    strong_memoize(:finder_options) do
+      params[:state] = default_state if params[:state].blank?
+
+      options = {
+        scope: params[:scope],
+        state: params[:state],
+        confidential: Gitlab::Utils.to_boolean(params[:confidential]),
+        sort: set_sort_order
+      }
+
+      # Used by view to highlight active option
+      @sort = options[:sort]
+
+      # When a user looks for an exact iid, we do not filter by search but only by iid
+      if params[:search] =~ /^#(?<iid>\d+)\z/
+        options[:iids] = Regexp.last_match[:iid]
+        params[:search] = nil
+      end
+
+      if @project
+        options[:project_id] = @project.id
+        options[:attempt_project_search_optimizations] = true
+      elsif @group
+        options[:group_id] = @group.id
+        options[:include_subgroups] = true
+        options[:attempt_group_search_optimizations] = true
+      end
+
+      params.permit(finder_type.valid_params).merge(options)
     end
-
-    if @project
-      options[:project_id] = @project.id
-      options[:attempt_project_search_optimizations] = true
-    elsif @group
-      options[:group_id] = @group.id
-      options[:include_subgroups] = true
-      options[:attempt_group_search_optimizations] = true
-    end
-
-    params.permit(finder_type.valid_params).merge(options)
   end
   # rubocop:enable Gitlab/ModuleWithInstanceVariables
 
@@ -147,7 +149,10 @@ module IssuableCollections
                                 when 'Issue'
                                   common_attributes + [:project, project: :namespace]
                                 when 'MergeRequest'
-                                  common_attributes + [:target_project, :latest_merge_request_diff, source_project: :route, head_pipeline: :project, target_project: :namespace]
+                                  common_attributes + [
+                                    :target_project, :latest_merge_request_diff, :approvals, :approved_by_users,
+                                    source_project: :route, head_pipeline: :project, target_project: :namespace
+                                  ]
                                 end
   end
   # rubocop:enable Gitlab/ModuleWithInstanceVariables