Commit 347d1633 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

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

Make LfsRequest EE-compatible

See merge request gitlab-org/gitlab-ce!23903
parents becfb662 6dba1bc0
...@@ -94,6 +94,7 @@ module LfsRequest ...@@ -94,6 +94,7 @@ module LfsRequest
def lfs_upload_access? def lfs_upload_access?
return false unless project.lfs_enabled? return false unless project.lfs_enabled?
return false unless has_authentication_ability?(:push_code) return false unless has_authentication_ability?(:push_code)
return false if limit_exceeded?
lfs_deploy_token? || can?(user, :push_code, project) lfs_deploy_token? || can?(user, :push_code, project)
end end
...@@ -121,4 +122,9 @@ module LfsRequest ...@@ -121,4 +122,9 @@ module LfsRequest
def has_authentication_ability?(capability) def has_authentication_ability?(capability)
(authentication_abilities || []).include?(capability) (authentication_abilities || []).include?(capability)
end end
# Overriden in EE
def limit_exceeded?
false
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment