root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

if the branch/tag count is over a certain limit, don't execute 

the long running git query
This commit is contained in:
Brett Walker 2017-10-11 14:15:28 +02:00
parent a11077e9d3
commit 6d3eea7b46
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/projects/commit_controller.rb
View File

@ -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

8
app/models/repository.rb
View File

@ -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