diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-13 11:49:24 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-17 13:44:31 -0500 |
| commit | d40970bf5eb3ee677965b0450bfceb66804c4528 (patch) | |
| tree | 09e3886aa7a38ec2c7b04dad2955fca9c813a549 | |
| parent | 41acc87fbd457d2894fb519eb48f215d017ddec2 (diff) | |
| download | gitlab-ce-d40970bf5eb3ee677965b0450bfceb66804c4528.tar.gz | |
Normalize sizes in Gitlab::Git::Blob
| -rw-r--r-- | lib/gitlab/git/blob.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/blob.rb b/lib/gitlab/git/blob.rb index e56eb0d3beb..98fd4e78126 100644 --- a/lib/gitlab/git/blob.rb +++ b/lib/gitlab/git/blob.rb @@ -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 |