diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-05-23 22:59:35 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-06-12 07:36:25 -0700 |
| commit | 0fdfd2dd6e01648f4daf6853f11a3ffc9a678a55 (patch) | |
| tree | 985c306c1885c68220ba99a40bd5426ac14d52ce /app/models/repository.rb | |
| parent | ff345f8ba11658c679b423e06bbc42b90af158eb (diff) | |
| download | gitlab-ce-0fdfd2dd6e01648f4daf6853f11a3ffc9a678a55.tar.gz | |
Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark
Here was the problem:
1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file.
2. If the blob is text, GitLab will attempt to display it.
3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters.
4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT.
To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires
an update to gitlab_git: gitlab-org/gitlab_git!86
Closes #13826
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 1ab163510bf..e5b277cb198 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -446,7 +446,7 @@ class Repository def blob_at(sha, path) unless Gitlab::Git.blank_ref?(sha) - Gitlab::Git::Blob.find(self, sha, path) + Blob.decorate(Gitlab::Git::Blob.find(self, sha, path)) end end |