diff options
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 4 | ||||
| -rw-r--r-- | app/models/repository.rb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index a62f05db7db..893763862ba 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -56,8 +56,8 @@ class Projects::CommitController < Projects::ApplicationController end def branches - @branches = @project.repository.branch_names_contains(commit.id) - @tags = @project.repository.tag_names_contains(commit.id) + @branches = @project.repository.branch_names_contains(commit.id, 1000) + @tags = @project.repository.tag_names_contains(commit.id, 1000) render layout: false end diff --git a/app/models/repository.rb b/app/models/repository.rb index d725c65081d..3a083b76202 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -715,12 +715,12 @@ class Repository end end - def branch_names_contains(sha) - refs_contains_sha('branch', sha) + def branch_names_contains(sha, limit = nil) + limit && branch_count > limit ? [] : refs_contains_sha('branch', sha) end - def tag_names_contains(sha) - refs_contains_sha('tag', sha) + def tag_names_contains(sha, limit = nil) + limit && tag_count > limit ? [] : refs_contains_sha('tag', sha) end def local_branches |