summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmad Sherif <me@ahmadsherif.com>2018-02-13 13:07:03 +0100
committerAhmad Sherif <me@ahmadsherif.com>2018-02-13 13:08:55 +0100
commitf93344723db5de91acaaefa6ff990eb630642d20 (patch)
tree4988ac73b2b128ebce8550982bcdb301cb35d922
parent41285af45d086ded796c6e05eed31890df69d825 (diff)
downloadgitlab-ce-fix/remove-allow-n-plus-1-from-network-graph.tar.gz
Remove allow_n_plus_1 block from Network::Graphfix/remove-allow-n-plus-1-from-network-graph
Closes #37436 Closes gitaly#998
-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