Commit82c7e30

committed

merge

2 parentse49ebdd +3332c4d commit82c7e30Copy full SHA for 82c7e30

File tree

+25

-11

lines changed

+25

-11

lines changed

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,18 @@ domain. All data is sent and received as JSON.`
`27`	`27`	`<preclass="terminal">`
`28`	`28`	`$ curl -i https://api.github.com`
`29`	`29`
`30`		`-HTTP/1.1 200 OK`
`31`		`-Content-Type: application/json`
`32`		`-Status: 200 OK`
	`30`	`+HTTP/1.1 302 Found`
	`31`	`+Server: nginx/1.0.12`
	`32`	`+Date: Mon, 20 Feb 2012 11:15:49 GMT`
	`33`	`+Content-Type: text/html;charset=utf-8`
	`34`	`+Connection: keep-alive`
	`35`	`+Status: 302 Found`
`33`	`36`	`X-RateLimit-Limit: 5000`
	`37`	`+ETag: "d41d8cd98f00b204e9800998ecf8427e"`
	`38`	`+Location: http://developer.github.com`
`34`	`39`	`X-RateLimit-Remaining: 4999`
`35`		`-Content-Length:2`
	`40`	`+Content-Length:0`
`36`	`41`
`37`		`-{}`
`38`	`42`	`</pre>`
`39`	`43`
`40`	`44`	Blank fields are included as`null` instead of being omitted.
`@@ -126,7 +130,8 @@ relatively new and uncommon HTTP verb, so resource endpoints also accept`
`126`	`130`	`POST requests.`
`127`	`131`
`128`	`132`	`PUT`
`129`		`-: Used for replacing resources or collections.`
	`133`	`+: Used for replacing resources or collections. For PUT requests`
	`134`	+with no`body` attribute, be sure to set the`Content-Length` header to zero.
`130`	`135`
`131`	`136`	`DELETE`
`132`	`137`	`: Used for deleting resources.`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,12 @@ Libraries for accessing the GitHub API from your favorite language.`
`12`	`12`
`13`	`13`	`[as3]:https://github.com/cbrammer/api-github-as3`
`14`	`14`
	`15`	`+##Clojure`
	`16`	`+`
	`17`	`+*[Tentacles][tentacles]`
	`18`	`+`
	`19`	`+[tentacles]:https://github.com/Raynes/tentacles`
	`20`	`+`
`15`	`21`	`##CSharp`
`16`	`22`
`17`	`23`	`*[CSharp GitHub API][csharp]`
`@@ -44,10 +50,11 @@ GitHub v3 API. Builds are available in [Maven Central](http://search.maven.org/`
`44`	`50`
`45`	`51`	`##Perl`
`46`	`52`
`47`		`-The[Pithub][pithub-github] library for Perl provides an interface`
`48`		`-to the entire GitHub v3 API. There are a lot of tests included and`
`49`		`-it is also available on the[CPAN][pithub-cpan].`
	`53`	`+*[Pithub][pithub-github] ([CPAN][pithub-cpan])`
	`54`	`+*[Net::Github][net-github-github] ([CPAN][net-github-cpan])`
`50`	`55`
	`56`	`+[net-github-github]:https://github.com/fayland/perl-net-github`
	`57`	`+[net-github-cpan]:http://search.cpan.org/~fayland/Net-GitHub-0.30/lib/Net/GitHub.pm`
`51`	`58`	`[pithub-github]:https://github.com/plu/Pithub`
`52`	`59`	`[pithub-cpan]:http://metacpan.org/module/Pithub`
`53`	`60`
`@@ -58,7 +65,6 @@ it is also available on the [CPAN][pithub-cpan].`
`58`	`65`	`*[GitHub Kohana Module][kohana]`
`59`	`66`
`60`	`67`	`[github-api]:https://github.com/yiiext/github-api`
`61`		`-[php-github-api]:https://github.com/ornicar/php-github-api`
`62`	`68`	`[kohana]:https://github.com/acoulton/github_v3_api`
`63`	`69`
`64`	`70`	`##Python`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,8 @@ def json(key)`
`113`	`113`	`"git_url"=>"git://github.com/octocat/Hello-World.git",`
`114`	`114`	`"ssh_url"=>"git@github.com:octocat/Hello-World.git",`
`115`	`115`	`"svn_url"=>"https://svn.github.com/octocat/Hello-World",`
	`116`	`+"mirror_url"=>"git://git.example.com/octocat/Hello-World",`
	`117`	`+"id"=>1296269,`
`116`	`118`	`"owner"=>USER,`
`117`	`119`	`"name"=>"Hello-World",`
`118`	`120`	`"description"=>"This your first repo!",`
`@@ -126,7 +128,8 @@ def json(key)`
`126`	`128`	`"master_branch"=>'master',`
`127`	`129`	`"open_issues"=>0,`
`128`	`130`	`"pushed_at"=>"2011-01-26T19:06:43Z",`
`129`		`-"created_at"=>"2011-01-26T19:01:12Z"`
	`131`	`+"created_at"=>"2011-01-26T19:01:12Z",`
	`132`	`+"updated_at"=>"2011-01-26T19:14:43Z"`
`130`	`133`	`}`
`131`	`134`
`132`	`135`	`FULL_REPO=REPO.merge({`

Comments

(0)