Sync changes from upstream repository

Hubot · Hubot · commit 872d47e80c43 · 2015-06-04T10:18:40.000Z
diff --git a/content/v3/git/blobs.md b/content/v3/git/blobs.md
@@ -7,18 +7,15 @@ title: Git Blobs | GitHub API
 * TOC
 {:toc}
 
-Since blobs can be any arbitrary binary data, the input and responses
-for the blob API takes an encoding parameter that can be either `utf-8`
-or `base64`.  If your data cannot be losslessly sent as a UTF-8 string,
-you can base64 encode it.
-
 Blobs leverage [these custom media types](#custom-media-types). You can
 read more about the use of media types in the API [here](/v3/media/).
 
 ## Get a Blob
 
     GET /repos/:owner/:repo/git/blobs/:sha
 
+The `content` in the response will always be Base64 encoded.
+
 *Note*: This API supports blobs up to 100 megabytes in size.
 
 ### Response
@@ -30,7 +27,14 @@ read more about the use of media types in the API [here](/v3/media/).
 
     POST /repos/:owner/:repo/git/blobs
 
-### Input
+### Parameters
+
+Name | Type | Description
+-----|------|-------------
+`content`|`string` | **Required**. The new blob's content.
+`encoding`|`string` | The encoding used for `content`. Currently, `"utf-8"` and `"base64"` are supported. Default: `"utf-8"`.
+
+### Example Input
 
 <%= json :content => "Content of the blob", :encoding => "utf-8" %>
 
diff --git a/lib/resources.rb b/lib/resources.rb
@@ -1854,11 +1854,11 @@ def fetch_content(key)
     }
 
     BLOB ||= {
-      :content => "Content of the blob",
-      :encoding => "utf-8",
+      :content => "Q29udGVudCBvZiB0aGUgYmxvYg==\n",
+      :encoding => "base64",
       :url      => "https://api.github.com/repos/octocat/example/git/blobs/3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15",
       :sha => "3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15",
-      :size => 100
+      :size => 19
     }
 
     BLOB_AFTER_CREATE ||= {

Original file line number	Diff line number	Diff line change
`@@ -1854,11 +1854,11 @@ def fetch_content(key)`
`1854`	`1854`	`}`
`1855`	`1855`
`1856`	`1856`	`BLOB \|\|= {`
`1857`		`- :content => "Content of the blob",`
`1858`		`- :encoding => "utf-8",`
	`1857`	`+ :content => "Q29udGVudCBvZiB0aGUgYmxvYg==\n",`
	`1858`	`+ :encoding => "base64",`
`1859`	`1859`	`:url => "https://api.github.com/repos/octocat/example/git/blobs/3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15",`
`1860`	`1860`	`:sha => "3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15",`
`1861`		`- :size => 100`
	`1861`	`+ :size => 19`
`1862`	`1862`	`}`
`1863`	`1863`
`1864`	`1864`	`BLOB_AFTER_CREATE \|\|= {`