diff options
author | Valery Sizov <valery@gitlab.com> | 2015-01-20 15:23:37 -0800 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2015-01-20 17:34:23 -0800 |
commit | ab7a79bf3bb47fd1c9d82da0bb29a3cdf0246cdc (patch) | |
tree | 7a32b98b19476c6ca633f9cb907f3f9c6e1f6bb8 /app/services/files | |
parent | 148740cc6769b0faf7ee564552143ccd0a18768b (diff) | |
download | gitlab-ce-ab7a79bf3bb47fd1c9d82da0bb29a3cdf0246cdc.tar.gz |
developer can push to protected branches
Diffstat (limited to 'app/services/files')
-rw-r--r-- | app/services/files/create_service.rb | 6 | ||||
-rw-r--r-- | app/services/files/delete_service.rb | 6 | ||||
-rw-r--r-- | app/services/files/update_service.rb | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb index 82e4d7b684f..b90adeef00a 100644 --- a/app/services/files/create_service.rb +++ b/app/services/files/create_service.rb @@ -3,11 +3,7 @@ require_relative "base_service" module Files class CreateService < BaseService def execute - allowed = if project.protected_branch?(ref) - can?(current_user, :push_code_to_protected_branches, project) - else - can?(current_user, :push_code, project) - end + allowed = Gitlab::GitAccess.can_push_to_branch?(current_user, project, ref) unless allowed return error("You are not allowed to create file in this branch") diff --git a/app/services/files/delete_service.rb b/app/services/files/delete_service.rb index ff5dc6ef34c..8e73c2e2727 100644 --- a/app/services/files/delete_service.rb +++ b/app/services/files/delete_service.rb @@ -3,11 +3,7 @@ require_relative "base_service" module Files class DeleteService < BaseService def execute - allowed = if project.protected_branch?(ref) - can?(current_user, :push_code_to_protected_branches, project) - else - can?(current_user, :push_code, project) - end + allowed = ::Gitlab::GitAccess.can_push_to_branch?(current_user, project, ref) unless allowed return error("You are not allowed to push into this branch") diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index a0f40154db0..b4986e1c5c6 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,11 +3,7 @@ require_relative "base_service" module Files class UpdateService < BaseService def execute - allowed = if project.protected_branch?(ref) - can?(current_user, :push_code_to_protected_branches, project) - else - can?(current_user, :push_code, project) - end + allowed = ::Gitlab::GitAccess.can_push_to_branch?(current_user, project, ref) unless allowed return error("You are not allowed to push into this branch") |