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

Extract EE-specific code from LfsRequest

See merge request gitlab-org/gitlab-ee!8902

app/controllers/concerns/lfs_request.rb

@@ -94,7 +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 project.above_size_limit? || objects_exceed_repo_limit?
+    return false if limit_exceeded?
 
     lfs_deploy_token? || can?(user, :push_code, project)
   end
@@ -122,6 +122,11 @@ module LfsRequest
   def has_authentication_ability?(capability)
     (authentication_abilities || []).include?(capability)
   end
+
+  # Overriden in EE
+  def limit_exceeded?
+    false
+  end
 end
 
 LfsRequest.prepend(EE::LfsRequest)

ee/app/controllers/concerns/ee/lfs_request.rb

@@ -3,14 +3,19 @@
 module EE
   module LfsRequest
     extend ActiveSupport::Concern
+    extend ::Gitlab::Utils::Override
     include ::Gitlab::Utils::StrongMemoize
 
+    private
+
+    override :lfs_forbidden!
     def lfs_forbidden!
-      if project.above_size_limit? || objects_exceed_repo_limit?
-        render_size_error
-      else
-        super
-      end
+      limit_exceeded? ? render_size_error : super
+    end
+
+    override :limit_exceeded?
+    def limit_exceeded?
+      project.above_size_limit? || objects_exceed_repo_limit?
     end
 
     def render_size_error