Merge branch 'dm-git-blob-sizes' into 'master'
Normalize sizes in Gitlab::Git::Blob See merge request !10742
This commit is contained in:
commit
2b934a7f43
|
@ -8,7 +8,7 @@ module Gitlab
|
|||
# the user. We load as much as we can for encoding detection
|
||||
# (Linguist) and LFS pointer parsing. All other cases where we need full
|
||||
# blob data should use load_all_data!.
|
||||
MAX_DATA_DISPLAY_SIZE = 10485760
|
||||
MAX_DATA_DISPLAY_SIZE = 10.megabytes
|
||||
|
||||
attr_accessor :name, :path, :size, :data, :mode, :id, :commit_id, :loaded_size, :binary
|
||||
|
||||
|
@ -153,7 +153,7 @@ module Gitlab
|
|||
def lfs_size
|
||||
if has_lfs_version_key?
|
||||
size = data.match(/(?<=size )([0-9]+)/)
|
||||
return size[1] if size
|
||||
return size[1].to_i if size
|
||||
end
|
||||
|
||||
nil
|
||||
|
|
|
@ -234,7 +234,7 @@ describe Gitlab::Git::Blob, seed_helper: true do
|
|||
|
||||
it { expect(blob.lfs_pointer?).to eq(true) }
|
||||
it { expect(blob.lfs_oid).to eq("4206f951d2691c78aac4c0ce9f2b23580b2c92cdcc4336e1028742c0274938e0") }
|
||||
it { expect(blob.lfs_size).to eq("19548") }
|
||||
it { expect(blob.lfs_size).to eq(19548) }
|
||||
it { expect(blob.id).to eq("f4d76af13003d1106be7ac8c5a2a3d37ddf32c2a") }
|
||||
it { expect(blob.name).to eq("image.jpg") }
|
||||
it { expect(blob.path).to eq("files/lfs/image.jpg") }
|
||||
|
@ -273,7 +273,7 @@ describe Gitlab::Git::Blob, seed_helper: true do
|
|||
|
||||
it { expect(blob.lfs_pointer?).to eq(false) }
|
||||
it { expect(blob.lfs_oid).to eq(nil) }
|
||||
it { expect(blob.lfs_size).to eq("1575078") }
|
||||
it { expect(blob.lfs_size).to eq(1575078) }
|
||||
it { expect(blob.id).to eq("5ae35296e1f95c1ef9feda1241477ed29a448572") }
|
||||
it { expect(blob.name).to eq("picture-invalid.png") }
|
||||
it { expect(blob.path).to eq("files/lfs/picture-invalid.png") }
|
||||
|
|
Loading…
Reference in New Issue