diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-07-13 13:57:30 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-13 13:57:30 -0500 |
| commit | 530f5158e297f3cde27f3566cfe13bad74ba3b50 (patch) | |
| tree | 270507d396bacdae8a4aa3489edfff0f47b718ca /app/services/files | |
| parent | 9b0ef1559f78e58b398e428763ff97dfdc53e186 (diff) | |
| download | gitlab-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/files')
| -rw-r--r-- | app/services/files/base_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 55da949f56a..37c5e321b39 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -42,7 +42,7 @@ module Files end def validate - 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_error("You are not allowed to push into this branch") |