summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-02-13 16:18:03 +0000
committerRobert Speicher <robert@gitlab.com>2018-02-13 16:18:03 +0000
commitb3679f767c16b0529fbec9f8c257f29fd53e6f74 (patch)
tree2f1179f449912ae10dc57968faacb0b7cc84ccb3 /app
parent2007927956ad2ed6cce6202ab57a5f4e9f0c7faa (diff)
parentf93344723db5de91acaaefa6ff990eb630642d20 (diff)
downloadgitlab-ce-b3679f767c16b0529fbec9f8c257f29fd53e6f74.tar.gz
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
Diffstat (limited to 'app')
-rw-r--r--app/models/network/graph.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index c351d2012c6..1e0d1f9edcb 100644
--- 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