Merge branch 'ce-reduce-diff-with-ce-in-lfs_request' into 'master'

Make LfsRequest EE-compatible

See merge request gitlab-org/gitlab-ce!23903
This commit is contained in:
Douglas Barbosa Alexandre 2018-12-19 17:03:30 +00:00
commit 347d163362
1 changed files with 6 additions and 0 deletions

View File

@ -94,6 +94,7 @@ module LfsRequest
def lfs_upload_access?
return false unless project.lfs_enabled?
return false unless has_authentication_ability?(:push_code)
return false if limit_exceeded?
lfs_deploy_token? || can?(user, :push_code, project)
end
@ -121,4 +122,9 @@ module LfsRequest
def has_authentication_ability?(capability)
(authentication_abilities || []).include?(capability)
end
# Overriden in EE
def limit_exceeded?
false
end
end