diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-19 11:23:08 +0100 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-19 11:23:08 +0100 |
| commit | 85e50301b4470c862603b7f2c503c336ea7c2210 (patch) | |
| tree | 506ace453b35505ce607abd41d8a132424df9acb /app/services/files/base_service.rb | |
| parent | 28f85155f5125131d109629871a3257a471ad5af (diff) | |
| parent | cd546a784434a8d1a872bc37e5a0c252b030f73c (diff) | |
| download | gitlab-ce-85e50301b4470c862603b7f2c503c336ea7c2210.tar.gz | |
Merge branch 'master' into rename-repo-files
Diffstat (limited to 'app/services/files/base_service.rb')
| -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 c8e66555c82..c4a206f785e 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -44,7 +44,7 @@ module Files end def validate - allowed = ::Gitlab::GitAccess.new(current_user, project, 'web').can_push_to_branch?(@target_branch) + allowed = ::Gitlab::UserAccess.new(current_user, project: project).can_push_to_branch?(@target_branch) unless allowed raise_error("You are not allowed to push into this branch") |