Commit 71b0f8ea authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Use existing methods for branch names: Ex use @repository.branch_names instead...

Use existing methods for branch names: Ex use @repository.branch_names instead of @repository.heads.map(&:name)
parent 85c8c3d46a26
......@@ -129,11 +129,11 @@ def module_enabled
def validates_merge_request
# Show git not found page if target branch doesn't exist
return invalid_mr unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch)
return invalid_mr unless @project.repository.branch_names.include?(@merge_request.target_branch)
# Show git not found page if source branch doesn't exist
# and there is no saved commits between source & target branch
return invalid_mr if !@project.repo.heads.map(&:name).include?(@merge_request.source_branch) && @merge_request.commits.blank?
return invalid_mr if !@project.repository.branch_names.include?(@merge_request.source_branch) && @merge_request.commits.blank?
end
def define_show_vars
......
......@@ -369,12 +369,19 @@ def repo_exists?
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 @@ def project_access_human(member)
# 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 @@ def commits_between(from, to)
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
......
......@@ -13,7 +13,7 @@
.mr_branch_box
%h5.cgray From (Head Branch)
.body
.padded= f.select(:source_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
.padded= f.select(:source_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'})
.mr_source_commit
.span2
......@@ -22,7 +22,7 @@
.mr_branch_box
%h5.cgray To (Base Branch)
.body
.padded= f.select(:target_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
.padded= f.select(:target_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'})
.mr_target_commit
%fieldset
......
......@@ -233,7 +233,7 @@
it "should be true for projects with external issues tracker if issues enabled" do
ext_project.can_have_issues_tracker_id?.should be_true
end
end
it "should be false for projects with internal issue tracker if issues enabled" do
project.can_have_issues_tracker_id?.should be_false
......@@ -247,4 +247,15 @@
ext_project.can_have_issues_tracker_id?.should be_false
end
end
describe :open_branches do
let(:project) { create(:project) }
before do
project.protected_branches.create(name: 'master')
end
it { project.open_branches.map(&:name).should include('bootstrap') }
it { project.open_branches.map(&:name).should_not include('master') }
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment