Commit 77cec14e authored by Nick Thomas's avatar Nick Thomas Committed by GitLab Release Tools Bot

Merge branch '61203-fix-lfs-ui-upload' into 'master'

Fix uploading of LFS tracked file through UI

Closes #61203

See merge request gitlab-org/gitlab-ce!28052

(cherry picked from commit 4d2d8124)

3f192e8a Fix Lfs::FileTransformer to work with file objects
48fcdf1f Add changelog entry
parent 2718721b
...@@ -24,7 +24,7 @@ module Lfs ...@@ -24,7 +24,7 @@ module Lfs
def new_file(file_path, file_content, encoding: nil) def new_file(file_path, file_content, encoding: nil)
if project.lfs_enabled? && lfs_file?(file_path) if project.lfs_enabled? && lfs_file?(file_path)
file_content = Base64.decode64(file_content) if encoding == 'base64' file_content = parse_file_content(file_content, encoding: encoding)
lfs_pointer_file = Gitlab::Git::LfsPointerFile.new(file_content) lfs_pointer_file = Gitlab::Git::LfsPointerFile.new(file_content)
lfs_object = create_lfs_object!(lfs_pointer_file, file_content) lfs_object = create_lfs_object!(lfs_pointer_file, file_content)
...@@ -66,5 +66,12 @@ module Lfs ...@@ -66,5 +66,12 @@ module Lfs
def link_lfs_object!(lfs_object) def link_lfs_object!(lfs_object)
project.lfs_objects << lfs_object project.lfs_objects << lfs_object
end end
def parse_file_content(file_content, encoding: nil)
return file_content.read if file_content.respond_to?(:read)
return Base64.decode64(file_content) if encoding == 'base64'
file_content
end
end end
end end
---
title: Fix uploading of LFS tracked file through UI
merge_request: 28052
author:
type: fixed
...@@ -62,6 +62,25 @@ describe Lfs::FileTransformer do ...@@ -62,6 +62,25 @@ describe Lfs::FileTransformer do
expect(result.encoding).to eq('text') expect(result.encoding).to eq('text')
end end
context 'when an actual file is passed' do
let(:file) { Tempfile.new(file_path) }
before do
file.write(file_content)
file.rewind
end
after do
file.unlink
end
it "creates an LfsObject with the file's content" do
subject.new_file(file_path, file)
expect(LfsObject.last.file.read).to eq file_content
end
end
context "when doesn't use LFS" do context "when doesn't use LFS" do
let(:file_path) { 'other.filetype' } let(:file_path) { 'other.filetype' }
......
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