Commit5bc45aa

committed

Merge 'upstream/master' into internal/master

2 parents494fd1f +1d42f18 commit5bc45aaCopy full SHA for 5bc45aa

File tree

+15

-4

lines changed

+15

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ Key \| Type \| Description`
`402`	`402`	`----\|------\|-------------`
`403`	`403`	`team`\|`object` \| The[team](/v3/orgs/teams/) that was modified. Note: older events may not include this in the payload.
`404`	`404`	`user`\|`object` \| The[user](/v3/users/) that was added to this team.
`405`		-`repo`\|`object` \| The[repository](/v3/repos/) that was added to this team.
	`405`	+`repository`\|`object` \| The[repository](/v3/repos/) that was added to this team.
`406`	`406`
`407`	`407`
`408`	`408`	`##WatchEvent`

Lines changed: 14 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1207,6 +1207,16 @@ def text_html(response, status, head = {})`
`1207`	`1207`	`}`
`1208`	`1208`	`}`
`1209`	`1209`
	`1210`	`+GIST_FILE_WITH_CONTENT={`
	`1211`	`+"ring.erl"=>{`
	`1212`	`+"size"=>932,`
	`1213`	`+"raw_url"=>"https://gist.githubusercontent.com/raw/365370/8c4d2d43d178df44f4c03a7f2ac0ff512853564e/ring.erl",`
	`1214`	`+"type"=>"text/plain",`
	`1215`	`+"language"=>"Erlang",`
	`1216`	`+"content"=>"contents of gist"`
	`1217`	`+}`
	`1218`	`+}`
	`1219`	`+`
`1210`	`1220`	`GIST={`
`1211`	`1221`	`"url"=>"https://api.github.com/gists/#{SecureRandom.hex(10)}",`
`1212`	`1222`	`"forks_url"=>"https://api.github.com/gists/#{SecureRandom.hex(10)}/forks",`
`@@ -1226,9 +1236,10 @@ def text_html(response, status, head = {})`
`1226`	`1236`	`}`
`1227`	`1237`
`1228`	`1238`	`FULL_GIST=GIST.dup.update \`
`1229`		`-:forks=>GIST_FORKS,`
`1230`		`-:history=>GIST_HISTORY,`
`1231`		`-:files=>GIST_FILE.merge({'content'=>'contents of gist'})`
	`1239`	`+"forks"=>GIST_FORKS,`
	`1240`	`+"history"=>GIST_HISTORY,`
	`1241`	`+"files"=>GIST_FILE_WITH_CONTENT`
	`1242`	`+`
`1232`	`1243`
`1233`	`1244`	`GIST_COMMENT={`
`1234`	`1245`	`"id"=>1,`

Comments

(0)