Skip to content
This repository was archived by the owner on Nov 1, 2017. It is now read-only.

Sync changes from upstream repository #724

Merged
hubot merged 1 commit into from
Mar 3, 2015
Merged

Sync changes from upstream repository #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion content/changes/2012-10-24-set-default-branch.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<pre class="terminal">
curl -u pengwynn \
-d '{"name": "octokit", "default_branch":"development"}' \
https://api.github.com/repos/pengwynn/octokit
https://api.github.com/repos/octokit/octokit.rb
</pre>

If you provide a branch name that hasn't been pushed to GitHub, we'll gracefully fall back to `'master'` or the first branch.
Expand Down
2 changes: 1 addition & 1 deletion content/guides/rendering-data-as-graphs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ arguments to `drawTreemap` above, to get all the information to show up properly
[D3.js]: http://d3js.org/
[basics-of-authentication]: ../basics-of-authentication/
[sinatra auth github]: https://github.com/atmos/sinatra_auth_github
[Octokit]: https://github.com/pengwynn/octokit
[Octokit]: https://github.com/octokit/octokit.rb
[D3 mortals]: http://www.recursion.org/d3-for-mere-mortals/
[D3 treemap]: http://bl.ocks.org/mbostock/4063582
[language API]: https://developer.github.com/v3/repos/#list-languages
Expand Down
2 changes: 1 addition & 1 deletion content/v3/repos/contents.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ Name | Type | Description
To follow redirects with curl, use the `-L` switch:

<pre class="terminal">
curl -L https://api.github.com/repos/pengwynn/octokit/tarball > octokit.tar.gz
curl -L https://api.github.com/repos/octokit/octokit.rb/tarball > octokit.tar.gz

% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
Expand Down
58 changes: 29 additions & 29 deletions lib/resources.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,14 +1667,14 @@ def fetch_content(key)
"path" => "README.md",
"content" => "encoded content ...",
"sha" => "3d21ec53a331a6f037a91c368710b99387d012c1",
"url" => "https://api.github.com/repos/pengwynn/octokit/contents/README.md",
"git_url" => "https://api.github.com/repos/pengwynn/octokit/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
"html_url" => "https://github.com/pengwynn/octokit/blob/master/README.md",
"download_url" => "https://raw.githubusercontent.com/pengwynn/octokit/master/README.md",
"url" => "https://api.github.com/repos/octokit/octokit.rb/contents/README.md",
"git_url" => "https://api.github.com/repos/octokit/octokit.rb/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
"html_url" => "https://github.com/octokit/octokit.rb/blob/master/README.md",
"download_url" => "https://raw.githubusercontent.com/octokit/octokit.rb/master/README.md",
"_links" => {
"git" => "https://api.github.com/repos/pengwynn/octokit/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
"self" => "https://api.github.com/repos/pengwynn/octokit/contents/README.md",
"html" => "https://github.com/pengwynn/octokit/blob/master/README.md"
"git" => "https://api.github.com/repos/octokit/octokit.rb/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
"self" => "https://api.github.com/repos/octokit/octokit.rb/contents/README.md",
"html" => "https://github.com/octokit/octokit.rb/blob/master/README.md"
},
}

Expand All @@ -1685,14 +1685,14 @@ def fetch_content(key)
"name" => "some-symlink",
"path" => "bin/some-symlink",
"sha" => "452a98979c88e093d682cab404a3ec82babebb48",
"url" => "https://api.github.com/repos/pengwynn/octokit/contents/bin/some-symlink",
"git_url" => "https://api.github.com/repos/pengwynn/octokit/git/blobs/452a98979c88e093d682cab404a3ec82babebb48",
"html_url" => "https://github.com/pengwynn/octokit/blob/master/bin/some-symlink",
"download_url" => "https://raw.githubusercontent.com/pengwynn/octokit/master/bin/some-symlink",
"url" => "https://api.github.com/repos/octokit/octokit.rb/contents/bin/some-symlink",
"git_url" => "https://api.github.com/repos/octokit/octokit.rb/git/blobs/452a98979c88e093d682cab404a3ec82babebb48",
"html_url" => "https://github.com/octokit/octokit.rb/blob/master/bin/some-symlink",
"download_url" => "https://raw.githubusercontent.com/octokit/octokit.rb/master/bin/some-symlink",
"_links" => {
"git" => "https://api.github.com/repos/pengwynn/octokit/git/blobs/452a98979c88e093d682cab404a3ec82babebb48",
"self" => "https://api.github.com/repos/pengwynn/octokit/contents/bin/some-symlink",
"html" => "https://github.com/pengwynn/octokit/blob/master/bin/some-symlink"
"git" => "https://api.github.com/repos/octokit/octokit.rb/git/blobs/452a98979c88e093d682cab404a3ec82babebb48",
"self" => "https://api.github.com/repos/octokit/octokit.rb/contents/bin/some-symlink",
"html" => "https://github.com/octokit/octokit.rb/blob/master/bin/some-symlink"
},
}

Expand Down Expand Up @@ -1721,14 +1721,14 @@ def fetch_content(key)
"name" => "octokit.rb",
"path" => "lib/octokit.rb",
"sha" => "fff6fe3a23bf1c8ea0692b4a883af99bee26fd3b",
"url" => "https://api.github.com/repos/pengwynn/octokit/contents/lib/octokit.rb",
"git_url" => "https://api.github.com/repos/pengwynn/octokit/git/blobs/fff6fe3a23bf1c8ea0692b4a883af99bee26fd3b",
"html_url" => "https://github.com/pengwynn/octokit/blob/master/lib/octokit.rb",
"download_url" => "https://raw.githubusercontent.com/pengwynn/octokit/master/lib/octokit.rb",
"url" => "https://api.github.com/repos/octokit/octokit.rb/contents/lib/octokit.rb",
"git_url" => "https://api.github.com/repos/octokit/octokit.rb/git/blobs/fff6fe3a23bf1c8ea0692b4a883af99bee26fd3b",
"html_url" => "https://github.com/octokit/octokit.rb/blob/master/lib/octokit.rb",
"download_url" => "https://raw.githubusercontent.com/octokit/octokit.rb/master/lib/octokit.rb",
"_links" => {
"self" => "https://api.github.com/repos/pengwynn/octokit/contents/lib/octokit.rb",
"git" => "https://api.github.com/repos/pengwynn/octokit/git/blobs/fff6fe3a23bf1c8ea0692b4a883af99bee26fd3b",
"html" => "https://github.com/pengwynn/octokit/blob/master/lib/octokit.rb",
"self" => "https://api.github.com/repos/octokit/octokit.rb/contents/lib/octokit.rb",
"git" => "https://api.github.com/repos/octokit/octokit.rb/git/blobs/fff6fe3a23bf1c8ea0692b4a883af99bee26fd3b",
"html" => "https://github.com/octokit/octokit.rb/blob/master/lib/octokit.rb",
},
},
{
Expand All @@ -1737,14 +1737,14 @@ def fetch_content(key)
"name" => "octokit",
"path" => "lib/octokit",
"sha" => "a84d88e7554fc1fa21bcbc4efae3c782a70d2b9d",
"url" => "https://api.github.com/repos/pengwynn/octokit/contents/lib/octokit",
"git_url" => "https://api.github.com/repos/pengwynn/octokit/git/trees/a84d88e7554fc1fa21bcbc4efae3c782a70d2b9d",
"html_url" => "https://github.com/pengwynn/octokit/tree/master/lib/octokit",
"url" => "https://api.github.com/repos/octokit/octokit.rb/contents/lib/octokit",
"git_url" => "https://api.github.com/repos/octokit/octokit.rb/git/trees/a84d88e7554fc1fa21bcbc4efae3c782a70d2b9d",
"html_url" => "https://github.com/octokit/octokit.rb/tree/master/lib/octokit",
"download_url" => nil,
"_links" => {
"self" => "https://api.github.com/repos/pengwynn/octokit/contents/lib/octokit",
"git" => "https://api.github.com/repos/pengwynn/octokit/git/trees/a84d88e7554fc1fa21bcbc4efae3c782a70d2b9d",
"html" => "https://github.com/pengwynn/octokit/tree/master/lib/octokit"
"self" => "https://api.github.com/repos/octokit/octokit.rb/contents/lib/octokit",
"git" => "https://api.github.com/repos/octokit/octokit.rb/git/trees/a84d88e7554fc1fa21bcbc4efae3c782a70d2b9d",
"html" => "https://github.com/octokit/octokit.rb/tree/master/lib/octokit"
},
},
]
Expand Down Expand Up @@ -1902,8 +1902,8 @@ def fetch_content(key)
:repository => SIMPLE_REPO,
:subject => {
:title => "Greetings",
:url => "https://api.github.com/repos/pengwynn/octokit/issues/123",
:latest_comment_url => "https://api.github.com/repos/pengwynn/octokit/issues/comments/123",
:url => "https://api.github.com/repos/octokit/octokit.rb/issues/123",
:latest_comment_url => "https://api.github.com/repos/octokit/octokit.rb/issues/comments/123",
:type => "Issue"
},
:reason => 'subscribed',
Expand Down