summaryrefslogtreecommitdiff
path: root/app/services/commits
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-07-13 13:57:30 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-07-13 13:57:30 -0500
commit530f5158e297f3cde27f3566cfe13bad74ba3b50 (patch)
tree270507d396bacdae8a4aa3489edfff0f47b718ca /app/services/commits
parent9b0ef1559f78e58b398e428763ff97dfdc53e186 (diff)
downloadgitlab-ce-530f5158e297f3cde27f3566cfe13bad74ba3b50.tar.gz
Revert "Merge branch '18193-developers-can-merge' into 'master' "
This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing changes made to fb229bbf7970ba908962b837b270adf56f14098f.
Diffstat (limited to 'app/services/commits')
-rw-r--r--app/services/commits/change_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb
index ed73d8cb8c2..c578097376a 100644
--- a/app/services/commits/change_service.rb
+++ b/app/services/commits/change_service.rb
@@ -23,7 +23,7 @@ module Commits
private
def check_push_permissions
- allowed = ::Gitlab::UserAccess.new(current_user, project: project).can_push_to_branch?(@target_branch)
+ allowed = ::Gitlab::GitAccess.new(current_user, project, 'web').can_push_to_branch?(@target_branch)
unless allowed
raise ValidationError.new('You are not allowed to push into this branch')
@@ -31,7 +31,7 @@ module Commits
true
end
-
+
def create_target_branch(new_branch)
# Temporary branch exists and contains the change commit
return success if repository.find_branch(new_branch)