Merge branch 'an/network-controller-fix' into 'master'

Fix Gitaly n+1 in NetworkController#show

Closes #37602 and gitaly#1056

See merge request gitlab-org/gitlab-ce!17548

app/controllers/projects/network_controller.rb

@@ -9,8 +9,6 @@ class Projects::NetworkController < Projects::ApplicationController
   before_action :assign_commit
 
   def show
-    # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37602
-    Gitlab::GitalyClient.allow_n_plus_1_calls do
     @url = project_network_path(@project, @ref, @options.merge(format: :json))
     @commit_url = project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")
 
@@ -28,7 +26,6 @@ class Projects::NetworkController < Projects::ApplicationController
 
     render
   end
-  end
 
   def assign_commit
     return if params[:extended_sha1].blank?

app/models/network/commit.rb

@@ -24,12 +24,7 @@ module Network
     end
 
     def parents(map)
-      @commit.parents.map do |p|
-        if map.include?(p.id)
-          map[p.id]
-        end
-      end
-      .compact
+      map.values_at(*@commit.parent_ids).compact
     end
   end
 end

changelogs/unreleased/an-network-controller-fix.yml

+---
+title: Prevent the graphs page from generating unnecessary Gitaly requests
+merge_request: 37602
+author:
+type: performance