Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Nov 1, 2017. It is now read-only.

Commit5f260f1

Browse files
committed
Merge 'upstream/master' into internal/master
2 parents1e22005 +0b41ed2 commit5f260f1

File tree

7 files changed

+48
-24
lines changed

7 files changed

+48
-24
lines changed

‎content/v3/activity/watching.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,15 @@ List repositories being watched by the authenticated user.
5151

5252
GET /repos/:owner/:repo/subscription
5353

54-
###Response
54+
###Response if you are subscribed to the repository
5555

5656
<%= headers 200 %>
5757
<%= json:repo_subscription %>
5858

59+
###Response if you are not subscribed to the repository
60+
61+
<%= headers 404 %>
62+
5963
##Set a Repository Subscription
6064

6165
PUT /repos/:owner/:repo/subscription

‎content/v3/pulls.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ Name | Description
2323
-----|-----------|
2424
`self`| The API location of this Pull Request.
2525
`html`| The HTML location of this Pull Request.
26-
`comments`| The API location of this Pull Request's Issue comments.
27-
`review_comments`| The API location of this Pull Request's Review comments.
28-
`statuses`| The API location of this Pull Request's commit statuses, which are the statuses of its`head` branch.
26+
`issue`| The API location of this Pull Request's[Issue](/v3/issues/).
27+
`comments`| The API location of this Pull Request's[Issue comments](/v3/issues/comments/).
28+
`review_comments`| The API location of this Pull Request's[Review comments](/v3/pulls/comments/).
29+
`commits`|The API location of this Pull Request's[commits](#list-commits-on-a-pull-request).
30+
`statuses`| The API location of this Pull Request's[commit statuses](/v3/repos/statuses/), which are the statuses of its`head` branch.
2931

3032
##List pull requests
3133

‎content/v3/repos.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ Name | Type | Description
188188

189189
##List contributors
190190

191+
List contributors to the specified repository, sorted by the number of commits per contributor in descending order.
192+
191193
GET /repos/:owner/:repo/contributors
192194

193195
###Parameters

‎content/v3/repos/releases.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ will receive published releases only.
1515

1616
GET /repos/:owner/:repo/releases
1717

18-
Note: This returns a list of releases, which does not include regular
18+
Note: This returns a list of releases, which does not include regular
1919
Git tags that have not been associated with a release.
2020
To get a list of Git tags, use the[Repository Tags API][repo tags api].
2121

@@ -68,7 +68,7 @@ Name | Type | Description
6868

6969
<%= headers 201,
7070
:Location => 'https://api.github.com/repos/octocat/Hello-World/releases/1' %>
71-
<%= json(:release) %>
71+
<%= json(:created_release) %>
7272

7373
##Edit a release
7474

‎content/v3/repos/statuses.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ Users with pull access can view commit statuses for a given ref:
3131

3232
GET /repos/:owner/:repo/statuses/:ref
3333

34+
Statuses are returned in reverse chronological order. The first status in the
35+
list will be the latest one.
36+
3437
###Parameters
3538

3639
Name | Type | Description

‎lib/resources.rb

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,10 @@ def text_html(response, status, head = {})
392392
"html_url"=>"https://github.com/octocat/Hello-World/pull/1",
393393
"diff_url"=>"https://github.com/octocat/Hello-World/pulls/1.diff",
394394
"patch_url"=>"https://github.com/octocat/Hello-World/pulls/1.patch",
395-
"issue_url"=>"https://github.com/octocat/Hello-World/issue/1",
395+
"issue_url"=>"https://api.github.com/repos/octocat/Hello-World/issues/1",
396+
"commits_url"=>"https://api.github.com/repos/octocat/Hello-World/pulls/1/commits",
397+
"review_comments_url"=>"https://api.github.com/repos/octocat/Hello-World/pulls/1/comments",
398+
"comments_url"=>"https://api.github.com/repos/octocat/Hello-World/issues/1/comments",
396399
"statuses_url"=>"https://api.github.com/repos/octocat/Hello-World/statuses/6dcb09b5b57875f334f61aebed695e2e4193db5e",
397400
"number"=>1,
398401
"state"=>"open",
@@ -421,10 +424,14 @@ def text_html(response, status, head = {})
421424
"https://api.github.com/repos/octocat/Hello-World/pulls/1"},
422425
"html"=>{'href'=>
423426
"https://github.com/octocat/Hello-World/pull/1"},
427+
"issue"=>{'href'=>
428+
"https://api.github.com/repos/octocat/Hello-World/issues/1"},
424429
"comments"=>{'href'=>
425430
"https://api.github.com/repos/octocat/Hello-World/issues/1/comments"},
426431
"review_comments"=>{'href'=>
427432
"https://api.github.com/repos/octocat/Hello-World/pulls/1/comments"},
433+
"commits"=>{'href'=>
434+
"https://api.github.com/repos/octocat/Hello-World/pulls/1/commits"},
428435
"statuses"=>{'href'=>
429436
"https://api.github.com/repos/octocat/Hello-World/statuses/6dcb09b5b57875f334f61aebed695e2e4193db5e"}
430437
},
@@ -505,14 +512,15 @@ def text_html(response, status, head = {})
505512
}
506513

507514
FILE={
508-
"sha"=>"6dcb09b5b57875f334f61aebed695e2e4193db5e",
515+
"sha"=>"bbcd538c8e72b8c175046e27cc8f907076331401",
509516
"filename"=>"file1.txt",
510517
"status"=>"added",
511518
"additions"=>103,
512519
"deletions"=>21,
513520
"changes"=>124,
514521
"blob_url"=>"https://github.com/octocat/Hello-World/blob/6dcb09b5b57875f334f61aebed695e2e4193db5e/file1.txt",
515522
"raw_url"=>"https://github.com/octocat/Hello-World/raw/6dcb09b5b57875f334f61aebed695e2e4193db5e/file1.txt",
523+
"contents_url"=>"https://api.github.com/repos/octocat/Hello-World/contents/file1.txt?ref=6dcb09b5b57875f334f61aebed695e2e4193db5e",
516524
"patch"=>"@@ -132,7 +132,7 @@ module Test @@ -1000,7 +1000,7 @@ module Test"
517525
}
518526

@@ -556,11 +564,27 @@ def text_html(response, status, head = {})
556564
}
557565
}
558566

567+
RELEASE_ASSET={
568+
"url"=>"https://api.github.com/repos/octocat/Hello-World/releases/assets/1",
569+
"id"=>1,
570+
"name"=>"example.zip",
571+
"label"=>"short description",
572+
"state"=>"uploaded",
573+
"content_type"=>"application/zip",
574+
"size"=>1024,
575+
"download_count"=>42,
576+
"created_at"=>"2013-02-27T19:35:32Z",
577+
"updated_at"=>"2013-02-27T19:35:32Z",
578+
"uploader"=>USER
579+
}
580+
559581
RELEASE={
560582
"url"=>"https://api.github.com/repos/octocat/Hello-World/releases/1",
561583
"html_url"=>"https://github.com/octocat/Hello-World/releases/v1.0.0",
562584
"assets_url"=>"https://api.github.com/repos/octocat/Hello-World/releases/1/assets",
563585
"upload_url"=>"https://uploads.github.com/repos/octocat/Hello-World/releases/1/assets{?name}",
586+
"tarball_url"=>"https://api.github.com/repos/octocat/Hello-World/tarball/v1.0.0",
587+
"zipball_url"=>"https://api.github.com/repos/octocat/Hello-World/zipball/v1.0.0",
564588
"id"=>1,
565589
"tag_name"=>"v1.0.0",
566590
"target_commitish"=>"master",
@@ -570,20 +594,13 @@ def text_html(response, status, head = {})
570594
"prerelease"=>false,
571595
"created_at"=>"2013-02-27T19:35:32Z",
572596
"published_at"=>"2013-02-27T19:35:32Z",
597+
"author"=>USER,
598+
"assets"=>[RELEASE_ASSET]
573599
}
574600

575-
RELEASE_ASSET={
576-
"url"=>"https://api.github.com/repos/octocat/Hello-World/releases/assets/1",
577-
"id"=>1,
578-
"name"=>"example.zip",
579-
"label"=>"short description",
580-
"state"=>"uploaded",
581-
"content_type"=>"application/zip",
582-
"size"=>1024,
583-
"download_count"=>42,
584-
"created_at"=>"2013-02-27T19:35:32Z",
585-
"updated_at"=>"2013-02-27T19:35:32Z"
586-
}
601+
CREATED_RELEASE=RELEASE.merge({
602+
"assets"=>[]
603+
})
587604

588605
DOWNLOAD={
589606
"url"=>"https://api.github.com/repos/octocat/Hello-World/downloads/1",

‎static/shared/css/documentation.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,6 @@ div.sidebar-module ul ul li span {
10181018
.contentulcode,
10191019
pcode {
10201020
font:12px Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;
1021-
color:#52595d;
10221021
-webkit-border-radius:3px;
10231022
-moz-border-radius:3px;
10241023
border-radius:3px;
@@ -1031,9 +1030,6 @@ p code {
10311030
display: inline-block;
10321031
}
10331032

1034-
.contentacode {
1035-
color:#4183C4;
1036-
}
10371033
.content .sectionbody .dlistdt {
10381034
margin-top:10px;
10391035
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp