Skip to content

G
gitlab-ce
Commit 17fd11e9 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in app/controllers/projects/lfs_api_controller.rb

parent 4f57d821
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/controllers/projects/lfs_api_controller.rb
View file @ 17fd11e9
...@@ -4,11 +4,8 @@ class Projects::LfsApiController < Projects::GitHttpClientController ...@@ -4,11 +4,8 @@ class Projects::LfsApiController < Projects::GitHttpClientController
include GitlabRoutingHelper include GitlabRoutingHelper
include LfsRequest include LfsRequest
<<<<<<< HEAD
prepend ::EE::Projects::LfsApiController prepend ::EE::Projects::LfsApiController
=======
>>>>>>> upstream/master
LFS_TRANSFER_CONTENT_TYPE = 'application/octet-stream'.freeze LFS_TRANSFER_CONTENT_TYPE = 'application/octet-stream'.freeze
skip_before_action :lfs_check_access!, only: [:deprecated] skip_before_action :lfs_check_access!, only: [:deprecated]
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7