Add latest changes from gitlab-org/gitlab@master

2 files changed, 22 insertions, 9 deletions

diff --git a/lib/gitlab/graphql/authorize/authorize_resource.rb b/lib/gitlab/graphql/authorize/authorize_resource.rb
index dc49c806398..884fc85c4ec 100644
--- a/lib/gitlab/graphql/authorize/authorize_resource.rb
+++ b/lib/gitlab/graphql/authorize/authorize_resource.rb
@@ -15,11 +15,7 @@ module Gitlab
             # If the `#authorize` call is used on multiple classes, we add the
             # permissions specified on a subclass, to the ones that were specified
             # on its superclass.
-            @required_permissions ||= if respond_to?(:superclass) && superclass.respond_to?(:required_permissions)
-                                        superclass.required_permissions.dup
-                                      else
-                                        []
-                                      end
+            @required_permissions ||= call_superclass_method(:required_permissions, []).dup
           end
 
           def authorize(*permissions)
@@ -27,6 +23,8 @@ module Gitlab
           end
 
           def authorizes_object?
+            return true if call_superclass_method(:authorizes_object?, false)
+
             defined?(@authorizes_object) ? @authorizes_object : false
           end
 
@@ -37,6 +35,14 @@ module Gitlab
           def raise_resource_not_available_error!(msg = RESOURCE_ACCESS_ERROR)
             raise ::Gitlab::Graphql::Errors::ResourceNotAvailable, msg
           end
+
+          private
+
+          def call_superclass_method(method_name, or_else)
+            return or_else unless respond_to?(:superclass) && superclass.respond_to?(method_name)
+
+            superclass.send(method_name) # rubocop: disable GitlabSecurity/PublicSend
+          end
         end
 
         def find_object(*args)
diff --git a/lib/gitlab/graphql/loaders/batch_model_loader.rb b/lib/gitlab/graphql/loaders/batch_model_loader.rb
index 805864cdd4c..41c3af33909 100644
--- a/lib/gitlab/graphql/loaders/batch_model_loader.rb
+++ b/lib/gitlab/graphql/loaders/batch_model_loader.rb
@@ -4,20 +4,27 @@ module Gitlab
   module Graphql
     module Loaders
       class BatchModelLoader
-        attr_reader :model_class, :model_id
+        attr_reader :model_class, :model_id, :preloads
 
-        def initialize(model_class, model_id)
+        def initialize(model_class, model_id, preloads = nil)
           @model_class = model_class
           @model_id = model_id
+          @preloads = preloads || []
         end
 
         # rubocop: disable CodeReuse/ActiveRecord
         def find
-          BatchLoader::GraphQL.for(model_id.to_i).batch(key: model_class) do |ids, loader, args|
+          BatchLoader::GraphQL.for([model_id.to_i, preloads]).batch(key: model_class) do |for_params, loader, args|
             model = args[:key]
+            keys_by_id = for_params.group_by(&:first)
+            ids = for_params.map(&:first)
+            preloads = for_params.flat_map(&:second).uniq
             results = model.where(id: ids)
+            results = results.preload(*preloads) unless preloads.empty?
 
-            results.each { |record| loader.call(record.id, record) }
+            results.each do |record|
+              keys_by_id.fetch(record.id, []).each { |k| loader.call(k, record) }
+            end
           end
         end
         # rubocop: enable CodeReuse/ActiveRecord