diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-04 18:48:17 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-04 18:48:17 +0300 |
| commit | 0f3f50d188e5c3f458d65b91765f080288cb06ab (patch) | |
| tree | 07888d4e8b6732215715cef46486e5cce98a9632 /app/models | |
| parent | 65b7a7a0632280c77de1dc9d6c93dfb5df0c2fc9 (diff) | |
| parent | 020a8482a47de625e2bfaa6f13a12e7cd8fe3600 (diff) | |
Merge branch 'zj-diverging-commit-count-no-rugged' into 'master'
Use commit finder instead of rev parse
See merge request gitlab-org/gitlab-ce!15683
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 165dafd83fd..82af299ec5e 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -256,7 +256,7 @@ class Repository end def diverging_commit_counts(branch) - root_ref_hash = raw_repository.rev_parse_target(root_ref).oid + root_ref_hash = raw_repository.commit(root_ref).id cache.fetch(:"diverging_commit_counts_#{branch.name}") do # Rugged seems to throw a `ReferenceError` when given branch_names rather # than SHA-1 hashes |