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

Check push permissions only when pushing directly to target branch.

Browse source
This commit is contained in:
Rubén Dávila 2016-03-17 15:16:34 -05:00
parent f728e4b519
commit cfb10c103f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/services/commits/revert_service.rb
View file

@ -9,7 +9,8 @@ module Commits
@commit = params[:commit] @commit = params[:commit]
@create_merge_request = params[:create_merge_request].present? @create_merge_request = params[:create_merge_request].present?
validate and commit check_push_permissions unless @create_merge_request
commit
rescue Repository::CommitError, Gitlab::Git::Repository::InvalidBlobName, GitHooksService::PreReceiveError, rescue Repository::CommitError, Gitlab::Git::Repository::InvalidBlobName, GitHooksService::PreReceiveError,
ValidationError, ReversionError => ex ValidationError, ReversionError => ex
error(ex.message) error(ex.message)
@ -45,11 +46,11 @@ module Commits
end end
end end
def validate def check_push_permissions
allowed = ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(@target_branch) allowed = ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(@target_branch)
unless allowed unless allowed
raise_error('You are not allowed to push into this branch') raise ValidationError.new('You are not allowed to push into this branch')
end end
true true