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
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-11-28 16:43:31 +0300
committerLin Jen-Shin <godfat@godfat.org>2017-11-30 11:03:28 +0300
commit4925ec50877c9bf1338d41a7676b3644f18370f7 (patch)
treeacf74aa4177d87d74be41921eda1a41d8ac5b94e /app/models
parent17c53d7d0dcc6739691f1298ddd0c254c9614571 (diff)
We could simply count the commits
Diffstat (limited to 'app/models')
-rw-r--r--app/models/merge_request.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index e232feaeada..bbc01e9677c 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -899,7 +899,8 @@ class MergeRequest < ActiveRecord::Base
def compute_diverged_commits_count
return 0 unless source_branch_sha && target_branch_sha
- Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_branch_sha, target_branch_sha).size
+ target_project.repository
+ .count_commits_between(source_branch_sha, target_branch_sha)
end
private :compute_diverged_commits_count