summaryrefslogtreecommitdiff
path: root/app/models/blob.rb
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-09-12 17:25:35 +0200
committerYorick Peterse <yorickpeterse@gmail.com>2016-09-14 14:15:31 +0200
commit0bc443e3b442b49cb6989282601d477c673c4412 (patch)
tree95ec95031362f65ab932189377a1738057309d4a /app/models/blob.rb
parent9980f52cb4ee32fbf1b132d605add5678e5ec067 (diff)
downloadgitlab-ce-0bc443e3b442b49cb6989282601d477c673c4412.tar.gz
Handle encoding in non-binary Blob instancesupdate-gitlab-git
gitlab_git 10.6.4 relies on Rugged marking blobs as binary or not, instead of relying on Linguist. Linguist in turn would mark text blobs as binary whenever they would contain byte sequences that could not be encoded using UTF-8. However, marking such blobs as binary is not correct. If one pushes a Markdown document with invalid character sequences it's still a text based Markdown document and not some random binary blob. This commit overwrites Blob#data so it automatically converts text-based content to UTF-8 (the encoding we use everywhere else) while taking care of replacing any invalid sequences with the UTF-8 replacement character. The data of binary blobs is left as-is.
Diffstat (limited to 'app/models/blob.rb')
-rw-r--r--app/models/blob.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb
index 12cc5aaafba..ab92e820335 100644
--- a/app/models/blob.rb
+++ b/app/models/blob.rb
@@ -22,6 +22,18 @@ class Blob < SimpleDelegator
new(blob)
end
+ # Returns the data of the blob.
+ #
+ # If the blob is a text based blob the content is converted to UTF-8 and any
+ # invalid byte sequences are replaced.
+ def data
+ if binary?
+ super
+ else
+ @data ||= super.encode(Encoding::UTF_8, invalid: :replace, undef: :replace)
+ end
+ end
+
def no_highlighting?
size && size > 1.megabyte
end