summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-12-18 12:53:36 +0100
committerRémy Coutable <remy@rymai.me>2018-12-19 16:04:00 +0100
commit6dba1bc099e9df03e15764fe790c861ca21cc33b (patch)
tree3de6fc0872a2181d87a630f46b4d53cfe8872bde /app/controllers/concerns
parentf9fd9b1def8dec9800f8d3857ee278ed6dca03c3 (diff)
downloadgitlab-ce-6dba1bc099e9df03e15764fe790c861ca21cc33b.tar.gz
Make LfsRequest EE-compatible
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/lfs_request.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/concerns/lfs_request.rb b/app/controllers/concerns/lfs_request.rb
index 9576eb14fdd..5572c3cee2d 100644
--- a/app/controllers/concerns/lfs_request.rb
+++ b/app/controllers/concerns/lfs_request.rb
@@ -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