diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-10 14:04:07 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-10 14:04:07 +0000 |
| commit | 39bda5d05e96ff9b2b8a89852b9520e8f262051e (patch) | |
| tree | 2d36f106e5371a629c86319e49c2150812057445 /lib | |
| parent | 151d9fb35fd66a161cf0e1f95d7b0f0448ca8034 (diff) | |
| parent | c5648de230905afd35a1b044a74b6d687eaed994 (diff) | |
| download | gitlab-ce-39bda5d05e96ff9b2b8a89852b9520e8f262051e.tar.gz | |
Merge branch 'disable-autocrlf-for-binary-files' into 'master'
Fix corrupted binary files when using API files endpoint
Closes #2219
See merge request !1123
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/files.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb index c7b30cf2f07..308c84dd135 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -67,7 +67,7 @@ module API file_path: blob.path, size: blob.size, encoding: "base64", - content: Base64.encode64(blob.data), + content: Base64.strict_encode64(blob.data), ref: ref, blob_id: blob.id, commit_id: commit.id, |