Merge branch 'fix/remove-allow-n-plus-1-from-network-graph' into 'master'

Remove allow_n_plus_1 block from Network::Graph Closes #37436 and gitaly#998 See merge request gitlab-org/gitlab-ce!17087

Merge branch 'fix/remove-allow-n-plus-1-from-network-graph' into 'master'
b3679f76 · Robert Speicher · 20079279 · f9334472 · b3679f76
Commit b3679f76 authored Feb 13, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

graph.rb app/models/network/graph.rb +2 -5

No files found.
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -61,11 +61,8 @@ module Network
        @reserved[i] = []
      end

-      # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37436
-      Gitlab::GitalyClient.allow_n_plus_1_calls do
-        commits_sort_by_ref.each do |commit|
-          place_chain(commit)
-        end
+      commits_sort_by_ref.each do |commit|
+        place_chain(commit)
      end

      # find parent spaces for not overlap lines