kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make message and code more clear

Browse source
This commit is contained in:
Lin Jen-Shin 2017-07-06 17:37:27 +08:00
parent 56ea7a0cfe
commit 550ccf4430
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/services/ci/create_pipeline_service.rb
View file

@ -28,7 +28,7 @@ module Ci
end
unless triggering_user_allowed_for_ref?(trigger_request)
return error("Insufficient permissions for protected #{ref}")
return error("Insufficient permissions for protected ref '#{ref}'")
end
unless commit
@ -77,8 +77,11 @@ module Ci
def triggering_user_allowed_for_ref?(trigger_request)
triggering_user = current_user || trigger_request.trigger.owner
(triggering_user && allowed_to_create?(triggering_user)) ||
if triggering_user
allowed_to_create?(triggering_user)
else # legacy triggers don't have a corresponding user
!project.protected_for?(ref)
end
end
def allowed_to_create?(triggering_user)