Fix GitAccess.

This commit is contained in:
Douwe Maan 2015-05-13 09:45:34 +02:00
parent 1981174a1e
commit c5e4b443ff
2 changed files with 6 additions and 13 deletions

View File

@ -136,7 +136,7 @@ module Gitlab
end
unless user.can?(action, project)
return
status =
case action
when :force_push_code_to_protected_branches
build_status_object(false, "You are not allowed to force push code to a protected branch on this project.")
@ -148,7 +148,8 @@ module Gitlab
build_status_object(false, "You are not allowed to change existing tags on this project.")
else # :push_code
build_status_object(false, "You are not allowed to push code to this project.")
end
end
return status
end
build_status_object(true)

View File

@ -115,18 +115,10 @@ describe Gitlab::GitAccess do
let(:actor) { key }
context 'pull code' do
context 'allowed' do
before { key.projects << project }
subject { access.download_access_check }
before { key.projects << project }
subject { access.download_access_check }
it { expect(subject.allowed?).to be_truthy }
end
context 'denied' do
subject { access.download_access_check }
it { expect(subject.allowed?).to be_falsey }
end
it { expect(subject.allowed?).to be_truthy }
end
end
end