Use existing methods for branch names: Ex use @repository.branch_names instead of @repository.heads.map(&:name)
This commit is contained in:
parent
025e41576e
commit
71b0f8ea0b
5 changed files with 32 additions and 13 deletions
|
@ -369,12 +369,19 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def open_branches
|
||||
if protected_branches.empty?
|
||||
self.repo.heads
|
||||
else
|
||||
pnames = protected_branches.map(&:name)
|
||||
self.repo.heads.reject { |h| pnames.include?(h.name) }
|
||||
end.sort_by(&:name)
|
||||
all_branches = repository.branches
|
||||
|
||||
if protected_branches.present?
|
||||
all_branches.reject! do |branch|
|
||||
protected_branches_names.include?(branch.name)
|
||||
end
|
||||
end
|
||||
|
||||
all_branches
|
||||
end
|
||||
|
||||
def protected_branches_names
|
||||
@protected_branches_names ||= protected_branches.map(&:name)
|
||||
end
|
||||
|
||||
def root_ref?(branch)
|
||||
|
@ -396,6 +403,6 @@ class Project < ActiveRecord::Base
|
|||
|
||||
# Check if current branch name is marked as protected in the system
|
||||
def protected_branch? branch_name
|
||||
protected_branches.map(&:name).include?(branch_name)
|
||||
protected_branches_names.include?(branch_name)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -63,8 +63,9 @@ class Repository
|
|||
end
|
||||
|
||||
# Returns an Array of branch names
|
||||
# sorted by name ASC
|
||||
def branch_names
|
||||
repo.branches.collect(&:name).sort
|
||||
branches.map(&:name)
|
||||
end
|
||||
|
||||
# Returns an Array of Branches
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue