diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-11-08 16:21:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-08 16:21:39 +0000 |
| commit | 0232450c8aee08a656275caf7b990e0bcbbb1cf4 (patch) | |
| tree | 9817869e4ed30b9ab05480c8b3daa6776148e557 /app/controllers | |
| parent | 9e294180f29ec7ec9e9734a65b2b5d3124d657e4 (diff) | |
| download | gitlab-ce-0232450c8aee08a656275caf7b990e0bcbbb1cf4.tar.gz | |
Fix Error 500 when pushing LFS objects with a write deploy key
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/lfs_request.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/concerns/lfs_request.rb b/app/controllers/concerns/lfs_request.rb index 738afd612f0..6cca9f95618 100644 --- a/app/controllers/concerns/lfs_request.rb +++ b/app/controllers/concerns/lfs_request.rb @@ -74,8 +74,9 @@ module LfsRequest def lfs_upload_access? return false unless project.lfs_enabled? + return false unless has_authentication_ability?(:push_code) - has_authentication_ability?(:push_code) && can?(user, :push_code, project) + lfs_deploy_token? || can?(user, :push_code, project) end def lfs_deploy_token? |