8000 Sync changes from upstream repository · liukailcl/developer.github.com@96c473d · GitHub
[go: up one dir, main page]

Skip to content

Commit 96c473d

Browse files
author
Hubot
committed
Sync changes from upstream repository
1 parent 3189caf commit 96c473d

File tree

5 files changed

+45
-27
lines changed

5 files changed

+45
-27
lines changed

content/v3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Error Name | Description
165165
`invalid` | This means the formatting of a field is invalid. The documentation for that resource should be able to give you more specific information.
166166
`already_exists` | This means another resource has the same value as this field. This can happen in resources that must have some unique key (such as Label names).
167167

168-
If resources have custom validation errors, they will be documented with the resource.
168+
Resources may also send custom validation errors (where `code` is `custom`). Custom errors will always have a `message` field describing the error, as well as a `documentation_url` field pointing to some content that might help you resolve the error.
169169

170170
## HTTP Redirects
171171

@@ -417,7 +417,7 @@ higher rate limit for your OAuth application.
417417
### Abuse Rate Limits
418418

419419
To prevent abuse, additional rate limits apply to some endpoints that
420-
create content. This rate limit applies to the creation of new content
420+
create content. This rate limit applies to the creation of new content
421421
over a period of time. These rate limits do not apply to private repositories
422422
or GitHub Enterprise installations.
423423

content/v3/activity/notifications.md

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ title: Notifications | GitHub API
77
* TOC
88
{:toc}
99

10-
GitHub Notifications are powered by [watched repositories](/v3/activity/watching/).
11-
Users receive notifications for discussions in repositories they watch
10+
Users receive notifications for conversations in repositories they watch
1211
including:
1312

1413
* Issues and their comments
1514
* Pull Requests and their comments
1615
* Comments on any commits
1716

18-
Notifications are also sent for discussions in unwatched repositories when the
17+
Notifications are also sent for conversations in unwatched repositories when the
1918
user is involved including:
2019

2120
* **@mentions**
@@ -59,20 +58,20 @@ Here's a list of potential `reason`s for receiving a notification:
5958
Reason Name | Description
6059
------------|------------
6160
`subscribed` | The notification arrived because you're watching the repository
62-
`manual` | The notification arrived because you've specifically decided to watch the item (via an Issue or Pull Request)
63-
`author` | The notification arrived because you've created the item
64-
`comment` | The notification arrived because you've commented on the item
65-
`mention` | The notification arrived because you were specifically **@mentioned** in the content
66-
`team_mention` | The notification arrived because you were on a team that was mentioned (like @org/team)
67-
`state_change` | The notification arrived because you changed the item state (like closing an Issue or merging a Pull Request)
68-
`assign` | The notification arrived because you were assigned to the Issue
61+
`manual` | The notification arrived because you've specifically decided to subscribe to the thread (via an Issue or Pull Request)
62+
`author` | The notification arrived because you've created the thread
63+
`comment` | The notification arrived because you've commented on the thread
64+
`mention` | The notification arrived because you were specifically **@mentioned** in the content
65+
`team_mention` | The notification arrived because you were on a team that was mentioned (like @org/team)
66+
`state_change` | The notification arrived because you changed the thread state (like closing an Issue or merging a Pull Request)
67+
`assign` | The notification arrived because you were assigned to the Issue
6968

7069
Note that the `reason` is modified on a per-thread basis, and can change, if the
71-
`reason` on a later notification is different.
70+
`reason` on a later notification is different.
7271

73-
For example, if you are the author of an issue, subsequent notifications on that
74-
issue will have a `reason` of `author`. If you're then **@mentioned** on the same
75-
issue, the notifications you fetch thereafter will have a `reason` of `mention`.
72+
For example, if you are the author of an issue, subsequent notifications on that
73+
issue will have a `reason` of `author`. If you're then **@mentioned** on the same
74+
issue, the notifications you fetch thereafter will have a `reason` of `mention`.
7675
The `reason` remains as `mention`, regardless of whether you're ever mentioned again.
7776

7877
## List your notifications
@@ -142,7 +141,7 @@ from the [default view on GitHub.com](https://github.com/notifications).
142141

143142
### Parameters
144143

145-
Name | Type | Description
144+
Name | Type | Description
146145
-----|------|--------------
147146
`last_read_at`|`string` | Describes the last point that notifications were checked. Anything updated since this time will not be updated. This is a timestamp in ISO 8601 format: `YYYY-MM-DDTHH:MM:SSZ`. Default: `Time.now`
148147

@@ -173,6 +172,12 @@ Name | Type | Description
173172
This checks to see if the current user is subscribed to a thread. You can also
174173
[get a Repository subscription](/v3/activity/watching/#get-a-repository-subscription).
175174

175+
{{#tip}}
176+
177+
Note that subscriptions are only generated if a user is participating in a conversation--for example, they've replied to the thread, were **@mention**ed, or manually subscribe to a thread.
178+
179+
{{/tip}}
180+
176181
GET /notifications/threads/:id/subscription
177182

178183
### Response
@@ -182,10 +187,7 @@ This checks to see if the current user is subscribed to a thread. You can also
182187

183188
## Set a Thread Subscription
184189

185-
This lets you subscribe to a thread, or ignore it. Subscribing to a thread
186-
is unnecessary if the user is already subscribed to the repository. Ignoring
187-
a thread will mute all future notifications (until you comment or get
188-
@mentioned).
190+
This lets you subscribe or unsubscribe from a conversation. Unsubscribing from a conversation mutes all future notifications (until you comment or get **@mention**ed once more).
189191

190192
PUT /notifications/threads/:id/subscription
191193

@@ -209,4 +211,3 @@ Name | Type | Description
209211
### Response
210212

211213
<%= headers 204 %>
212-

content/v3/activity/watching.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ Name | Type | Description
7171
`subscribed`|`boolean`| Determines if notifications should be received from this repository.
7272
`ignored`|`boolean`| Determines if all notifications should be blocked from this repository.
7373

74+
{{#tip}}
75+
76+
If you would like to watch a repository, set `subscribed` to `true`. If you would like to ignore notifications made within a repository, set `ignored` to `true`. If you would like to stop watching a repository, [delete the repository's subscription](#delete-a-repository-subscription) completely.
77+
78+
{{/tip}}
7479

7580
### Response
7681

@@ -79,6 +84,12 @@ Name | Type | Description
7984

8085
## Delete a Repository Subscription
8186

87+
{{#tip}}
88+
89+
This endpoint should only be used to stop watching a repository. To control whether or not you wish to receive notifications from a repository, [set the repository's subscription manually](#set-a-repository-subscription).
90+
91+
{{/tip}}
92+
8293
DELETE /repos/:owner/:repo/subscription
8394

8495
### Response

content/v3/pulls.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,8 @@ Name | Type | Description
199199

200200
<%= headers 405 %>
201201
<%= json \
202-
:sha => nil,
203-
:merged => false,
204-
:message => 'Failure reason'
202+
:message => "Pull Request is not mergeable",
203+
:documentation_url => "https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button"
205204
%>
206205

207206
### Labels, assignees, and milestones

lib/resources.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,8 @@ def fetch_content(key)
733733
TEAM ||= {
734734
"id" => 1,
735735
"url" => "https://api.github.com/teams/1",
736-
"name" => "Owners",
736+
"name" => "Justice League",
737+
"slug" => "justice-league",
737738
"description" => "A great team.",
738739
"permission" => "admin",
739740
"members_url" => "https://api.github.com/teams/1/members{/member}",
@@ -1664,6 +1665,7 @@ def fetch_content(key)
16641665
"url" => "https://api.github.com/repos/pengwynn/octokit/contents/README.md",
16651666
"git_url" => "https://api.github.com/repos/pengwynn/octokit/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
16661667
"html_url" => "https://github.com/pengwynn/octokit/blob/master/README.md",
1668+
"download_url" => "https://raw.githubusercontent.com/pengwynn/octokit/master/README.md",
16671669
"_links" => {
16681670
"git" => "https://api.github.com/repos/pengwynn/octokit/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
16691671
"self" => "https://api.github.com/repos/pengwynn/octokit/contents/README.md",
@@ -1681,6 +1683,7 @@ def fetch_content(key)
16811683
"url" => "https://api.github.com/repos/pengwynn/octokit/contents/bin/some-symlink",
16821684
"git_url" => "https://api.github.com/repos/pengwynn/octokit/git/blobs/452a98979c88e093d682cab404a3ec82babebb48",
16831685
"html_url" => "https://github.com/pengwynn/octokit/blob/master/bin/some-symlink",
1686+
"download_url" => "https://raw.githubusercontent.com/pengwynn/octokit/master/bin/some-symlink",
16841687
"_links" => {
16851688
"git" => "https://api.github.com/repos/pengwynn/octokit/git/blobs/452a98979c88e093d682cab404a3ec82babebb48",
16861689
"self" => "https://api.github.com/repos/pengwynn/octokit/contents/bin/some-symlink",
@@ -1698,6 +1701,7 @@ def fetch_content(key)
16981701
"url" => "https://api.github.com/repos/jquery/jquery/contents/test/qunit?ref=master",
16991702
"git_url" => "https://api.github.com/repos/jquery/qunit/git/trees/6ca3721222109997540bd6d9ccd396902e0ad2f9",
17001703
"html_url" => "https://github.com/jquery/qunit/tree/6ca3721222109997540bd6d9ccd396902e0ad2f9",
1704+
"download_url" => nil,
17011705
"_links" => {
17021706
"git" => "https://api.github.com/repos/jquery/qunit/git/trees/6ca3721222109997540bd6d9ccd396902e0ad2f9",
17031707
"self" => "https://api.github.com/repos/jquery/jquery/contents/test/qunit?ref=master",
@@ -1715,6 +1719,7 @@ def fetch_content(key)
17151719
"url" => "https://api.github.com/repos/pengwynn/octokit/contents/lib/octokit.rb",
17161720
"git_url" => "https://api.github.com/repos/pengwynn/octokit/git/blobs/fff6fe3a23bf1c8ea0692b4a883af99bee26fd3b",
17171721
"html_url" => "https://github.com/pengwynn/octokit/blob/master/lib/octokit.rb",
1722+
"download_url" => "https://raw.githubusercontent.com/pengwynn/octokit/master/lib/octokit.rb",
17181723
"_links" => {
17191724
"self" => "https://api.github.com/repos/pengwynn/octokit/contents/lib/octokit.rb",
17201725
"git" => "https://api.github.com/repos/pengwynn/octokit/git/blobs/fff6fe3a23bf1c8ea0692b4a883af99bee26fd3b",
@@ -1730,6 +1735,7 @@ def fetch_content(key)
17301735
"url" => "https://api.github.com/repos/pengwynn/octokit/contents/lib/octokit",
17311736
"git_url" => "https://api.github.com/repos/pengwynn/octokit/git/trees/a84d88e7554fc1fa21bcbc4efae3c782a70d2b9d",
17321737
"html_url" => "https://github.com/pengwynn/octokit/tree/master/lib/octokit",
1738+
"download_url" => nil,
17331739
"_links" => {
17341740
"self" => "https://api.github.com/repos/pengwynn/octokit/contents/lib/octokit",
17351741
"git" => "https://api.github.com/repos/pengwynn/octokit/git/trees/a84d88e7554fc1fa21bcbc4efae3c782a70d2b9d",
@@ -1849,6 +1855,7 @@ def fetch_content(key)
18491855
"url" => "https://api.github.com/repos/octocat/Hello-World/contents/notes/hello.txt",
18501856
"html_url" => "https://github.com/octocat/Hello-World/blob/master/notes/hello.txt",
18511857
"git_url" => "https://api.github.com/repos/octocat/Hello-World/git/blobs/95b966ae1c166bd92f8ae7d1c313e738c731dfc3",
1858+
"download_url" => "https://raw.githubusercontent.com/octocat/HelloWorld/master/notes/hello.txt",
18521859
"type" => "file",
18531860
"_links" => {
18541861
"self" => "https://api.github.com/repos/octocat/Hello-World/contents/notes/hello.txt",
@@ -2179,7 +2186,7 @@ def fetch_content(key)
21792186
"client_id" => "12313412",
21802187
"client_secret" => "kj123131132",
21812188
"organization_name" => "Homestar Runners",
2182-
"organization_team" => "homestarrunners/owners"
2189+
"organization_team" => "homestarrunners/characters"
21832190
},
21842191
"smtp" => {
21852192
"enabled" => true,

0 commit comments

Comments
 (0)
0