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

Fix tests and fine tweak permission error message

Browse source
This commit is contained in:
Lin Jen-Shin 2017-07-19 22:37:38 +08:00
parent a397a0eb1a
commit d035d73524
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,16 +23,16 @@ module Ci
unless allowed_to_trigger_pipeline?(triggering_user)
if can?(triggering_user, :create_pipeline, project)
return error("Insufficient permissions for protected ref '#{ref}'")
if branch? || tag?
return error("Insufficient permissions for protected ref '#{ref}'")
else
return error('Reference not found')
end
else
return error('Insufficient permissions to create a new pipeline')
end
end
unless branch? || tag?
return error('Reference not found')
end
unless commit
return error('Commit not found')
end

6
lib/gitlab/user_access.rb
View file

@ -94,13 +94,15 @@ module Gitlab
def protected_branch_accessible_to?(ref, action:)
ProtectedBranch.protected_ref_accessible_to?(
ref, user, action: action,
ref, user,
action: action,
protected_refs: project.protected_branches)
end
def protected_tag_accessible_to?(ref, action:)
ProtectedTag.protected_ref_accessible_to?(
ref, user, action: action,
ref, user,
action: action,
protected_refs: project.protected_tags)
end