Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-05-16 18:27:50 +0300
committerLin Jen-Shin <godfat@godfat.org>2019-05-16 18:27:50 +0300
commit112193e8a6dea1a42e234e06244b1a20dd7d711b (patch)
treee806975a07e379ac0deab3696c35c9d3ed0031e8 /lib
parent0795742fef8c6313e1daa7cff82f4af76b4caeb5 (diff)
parentf86797b5a91791875ccd1a02806d4cab236c1ac6 (diff)
Merge branch 'jc-omit-count-diverging-commits-max' into 'master'
Omit max-count for diverging_commit_counts behind feature flag See merge request gitlab-org/gitlab-ce!28157
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/repository.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index fc9bcbdcca2..455588f3c66 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -500,7 +500,7 @@ module Gitlab
end
# Return total diverging commits count
- def diverging_commit_count(from, to, max_count:)
+ def diverging_commit_count(from, to, max_count: 0)
wrapped_gitaly_errors do
gitaly_commit_client.diverging_commit_count(from, to, max_count: max_count)
end