Workaround for #38259

9f71ea0d · Andrew Newdigate · Robert Speicher · e85e803c · 9f71ea0d
Commit 9f71ea0d authored Sep 22, 2017 by Andrew Newdigate Committed by Robert Speicher Sep 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

lib/gitlab/data_builder/push.rb lib/gitlab/data_builder/push.rb +5 -2

No files found.
--- a/lib/gitlab/data_builder/push.rb
+++ b/lib/gitlab/data_builder/push.rb
@@ -64,8 +64,11 @@ module Gitlab
        # For performance purposes maximum 20 latest commits
        # will be passed as post receive hook data.
-        commit_attrs = commits_limited.map do |commit|
+        # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/38259
-          commit.hook_attrs(with_changed_files: true)
+        commit_attrs = Gitlab::GitalyClient.allow_n_plus_1_calls do
+          commits_limited.map do |commit|
+            commit.hook_attrs(with_changed_files: true)
+          end
        end
        type = Gitlab::Git.tag_ref?(ref) ? 'tag_push' : 'push'