summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-11 14:29:36 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-11 14:29:36 +0200
commit7f3228ec74725c02efb0e23ff8380eaa03739891 (patch)
tree409192c60bfa07405ed558b1e12acfd153d899ef /lib/api/files.rb
parentb8d48ca84f275b1d39f8745c8e1c842e995a63a0 (diff)
parent01af2c98b64149cf8ba906b4bcf7650b7abdd446 (diff)
downloadgitlab-ce-7f3228ec74725c02efb0e23ff8380eaa03739891.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'lib/api/files.rb')
-rw-r--r--lib/api/files.rb2
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,