Commit b81375aa authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'reduce-lfs_api_controller-diff-with-ce' into 'master'

Reduce diff with CE in Projects::LfsApiController

See merge request gitlab-org/gitlab-ee!8895
parents ed4b0f7a 78803965
# frozen_string_literal: true
class Projects::LfsApiController < Projects::GitHttpClientController
include ApplicationSettingsHelper
include ApplicationHelper
include GitlabRoutingHelper
include LfsRequest
prepend ::EE::Projects::LfsApiController
LFS_TRANSFER_CONTENT_TYPE = 'application/octet-stream'.freeze
skip_before_action :lfs_check_access!, only: [:deprecated]
......@@ -128,3 +123,5 @@ class Projects::LfsApiController < Projects::GitHttpClientController
_('You cannot write to this read-only GitLab instance.')
end
end
Projects::LfsApiController.prepend(::EE::Projects::LfsApiController)
......@@ -4,6 +4,7 @@ module EE
module Projects
module LfsApiController
extend ::Gitlab::Utils::Override
include GitlabRoutingHelper
override :batch_operation_disallowed?
def batch_operation_disallowed?
......
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