Automatic merge of gitlab-org/gitlab-ce master

app/models/network/graph.rb

@@ -40,9 +40,12 @@ module Network
     # Get commits from repository
     #
     def collect_commits
-      find_commits(count_to_display_commit_in_center).map do |commit|
-        # Decorate with app/model/network/commit.rb
-        Network::Commit.new(commit)
+      # https://gitlab.com/gitlab-org/gitlab-ce/issues/58013
+      Gitlab::GitalyClient.allow_n_plus_1_calls do
+        find_commits(count_to_display_commit_in_center).map do |commit|
+          # Decorate with app/model/network/commit.rb
+          Network::Commit.new(commit)
+        end
       end
     end
 

lib/banzai/filter/relative_link_filter.rb

@@ -150,7 +150,10 @@ module Banzai
       end
 
       def uri_type(path)
-        @uri_types[path] ||= current_commit.uri_type(path)
+        # https://gitlab.com/gitlab-org/gitlab-ce/issues/58011
+        Gitlab::GitalyClient.allow_n_plus_1_calls do
+          @uri_types[path] ||= current_commit.uri_type(path)
+        end
       end
 
       def current_commit

lib/gitlab/gitaly_client.rb

@@ -28,7 +28,7 @@ module Gitlab
 
     PEM_REGEX = /\-+BEGIN CERTIFICATE\-+.+?\-+END CERTIFICATE\-+/m
     SERVER_VERSION_FILE = 'GITALY_SERVER_VERSION'
-    MAXIMUM_GITALY_CALLS = 35
+    MAXIMUM_GITALY_CALLS = 30
     CLIENT_NAME = (Sidekiq.server? ? 'gitlab-sidekiq' : 'gitlab-web').freeze
 
     MUTEX = Mutex.new

lib/gitlab/shell.rb

@@ -280,7 +280,10 @@ module Gitlab
     #   add_namespace("default", "gitlab")
     #
     def add_namespace(storage, name)
-      Gitlab::GitalyClient::NamespaceService.new(storage).add(name)
+      # https://gitlab.com/gitlab-org/gitlab-ce/issues/58012
+      Gitlab::GitalyClient.allow_n_plus_1_calls do
+        Gitlab::GitalyClient::NamespaceService.new(storage).add(name)
+      end
     rescue GRPC::InvalidArgument => e
       raise ArgumentError, e.message
     end