diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-06-22 13:03:24 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-07-05 16:54:22 -0500 |
| commit | 8b14d1d2c20a5b8c7ef985007f90fd3aa12c3277 (patch) | |
| tree | 8feea6564958e689d056ba5e483a1369c06f51cb /app/services/files | |
| parent | 7735ef86f0714a5b2a4cb4db8ec0471654563885 (diff) | |
| download | gitlab-ce-8b14d1d2c20a5b8c7ef985007f90fd3aa12c3277.tar.gz | |
Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell expects and make the `protocol` param in `GitAccess` mandatory.
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 0326a8823e9..4bdb68a3698 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -43,7 +43,7 @@ module Files end def validate - allowed = ::Gitlab::GitAccess.new(current_user, 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") |