diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-25 09:35:54 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-25 09:35:54 +0000 |
| commit | 0f2a906211dcbf4978b465d342521dda14ade729 (patch) | |
| tree | 601af1737f9424d416ae1f16cea9a1f727479541 /app | |
| parent | 07ee83932fb755f4e0c89ba3bf172a6ae728d601 (diff) | |
| parent | 0689663487c66d21aa83da0830bc2c042f89e6e8 (diff) | |
| download | gitlab-ce-0f2a906211dcbf4978b465d342521dda14ade729.tar.gz | |
Merge branch 'update-gitlab-git' into 'master'
Update gitlab_git & use new method for counting branches
Corresponding gitlab_git merge request detailing some of the rationale behind this: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/62
Fixes #12418
See merge request !2535
Diffstat (limited to 'app')
| -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 9e8bd91fde9..6c1ee4b29cd 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -57,7 +57,7 @@ class Repository # This method return true if repository contains some content visible in project page. # def has_visible_content? - !raw_repository.branches.empty? + raw_repository.branch_count > 0 end def commit(id = 'HEAD') |