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.

Commit219165b

Browse files
committed
Merge github/master from upstream
2 parents546529a +2f1d95a commit219165b

File tree

6 files changed

+63
-7
lines changed

6 files changed

+63
-7
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
kind: change
3+
title: User Agent now mandatory
4+
created_at: 2013-04-24
5+
author_name: pengwynn
6+
---
7+
8+
After an almost six week grace period, we're now enforcing the [User Agent
9+
header][1] for all API requests. Most HTTP libraries (including cURL)
10+
set this header by default. If you're experiencing an increase in `403`
11+
responses, be sure and check your code.
12+
13+
[1]: /v3/#user-agent-required
14+
15+
If you have any questions or feedback, please drop us a line at
16+
[support@github.com](mailto:support@github.com?subject=User Agent Requirement).
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
kind: change
3+
title: Deprecating a Confusing Attribute in the Pull Request API
4+
created_at: 2013-04-25
5+
author_name: jasonrudolph
6+
---
7+
8+
When you get the details for a Pull Request from the API, the
9+
[response](/v3/pulls/#get-a-single-pull-request) provides everything there is to
10+
know about that Pull Request. In addition to the useful information provided in
11+
the API response, the JSON also includes the `merge_commit_sha` attribute. This
12+
attribute is a frequent source of misunderstanding, and we aim to remove the
13+
confusion.
14+
15+
To help current API consumers, we've [documented the
16+
attribute](/v3/pulls/#mergability) for improved understanding.
17+
18+
To protect future API consumers from this confusion, we have
19+
[deprecated](/#expected-changes) the `merge_commit_sha` attribute, and we will
20+
remove it in the next major version of the API.
21+
22+
As always, if you have any questions or feedback, please drop us a line at
23+
[support@github.com](mailto:support@github.com?subject=Deprecating merge_commit_sha).

‎content/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ objects.
3939
*`[ ]``master_branch` becomes`default_branch`.
4040
*`[ ]``integrate_branch` on the[repo API](/v3/repos/#get) will no longer be
4141
returned.
42+
*`[ ]``merge_commit_sha` on the[pull request API](/v3/pulls/#get-a-single-pull-request)
43+
will no longer be returned.
4244
*`[ ]` Use the`private` attribute when creating a private repository,
4345
instead of setting`public` to false.
4446
*`[ ]` Use JSON to POST to the "repos/:owner/:repo/forks" endpoint, instead of a query string.

‎content/v3/pulls.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,18 @@ base
6363
<%= headers 200 %>
6464
<%= json:full_pull %>
6565

66+
###Mergability
67+
68+
Each time the pull request receives new commits, GitHub creates a merge commit
69+
to_test_ whether the pull request can be automatically merged into the base
70+
branch. (This_test_ commit is not added to the base branch or the head branch.)
71+
The`merge_commit_sha` attribute holds the SHA of the_test_ merge commit;
72+
however, this attribute is[deprecated](/#expected-changes) and is scheduled for
73+
removal in the next version of the API. The Boolean`mergable` attribute will
74+
remain to indicate whether the pull request can be automatically merged.
75+
76+
###Alternative Response Formats
77+
6678
Pass the appropriate[media type](/v3/media/#commits-commit-comparison-and-pull-requests) to fetch diff and patch formats.
6779

6880
##Create a pull request

‎content/v3/repos/hooks.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,12 @@ triggered on pushes.
159159
<%= headers 200 %>
160160
<%= json:hook %>
161161

162-
##Test a hook
162+
##Test a`push`hook
163163

164164
This will trigger the hook with the latest push to the current
165-
repository.
165+
repository if the hook is subscribed to`push` events. If the
166+
hook is not subscribed to`push` events, the server will respond
167+
with 204 but no test POST will be generated.
166168

167169
POST /repos/:owner/:repo/hooks/:id/tests
168170

‎lib/resources.rb

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ module Helpers
3131
:pengwynn=>'7e19cd5486b5d6dc1ef90e671ba52ae0',
3232
:pezra=>'f38112009dc16547051c8ac246cee443',
3333
:rick=>'a44d5abad6e86cff4e34d9f0839535c9',
34-
:agh=>'6af915d3c6aa4ad30bbad43d8035fe10'
34+
:agh=>'6af915d3c6aa4ad30bbad43d8035fe10',
35+
:jasonrudolph=>'592e1e6f041f9a4ec51846fd82013aea'
3536
}
3637

3738
DefaultTimeFormat="%B %-d, %Y".freeze
@@ -783,27 +784,27 @@ def text_html(response, status, head = {})
783784

784785
TREE={
785786
"sha"=>"9fb037999f264ba9a7fc6274d15fa3ae2ab98312",
786-
"url"=>"https://api.github.com/repo/octocat/Hello-World/trees/9fb037999f264ba9a7fc6274d15fa3ae2ab98312",
787+
"url"=>"https://api.github.com/repos/octocat/Hello-World/trees/9fb037999f264ba9a7fc6274d15fa3ae2ab98312",
787788
"tree"=>[
788789
{"path"=>"file.rb",
789790
"mode"=>"100644",
790791
"type"=>"blob",
791792
"size"=>30,
792793
"sha"=>"44b4fc6d56897b048c772eb4087f854f46256132",
793-
"url"=>"https://api.github.com/octocat/Hello-World/git/blobs/44b4fc6d56897b048c772eb4087f854f46256132",
794+
"url"=>"https://api.github.com/repos/octocat/Hello-World/git/blobs/44b4fc6d56897b048c772eb4087f854f46256132",
794795
},
795796
{"path"=>"subdir",
796797
"mode"=>"040000",
797798
"type"=>"tree",
798799
"sha"=>"f484d249c660418515fb01c2b9662073663c242e",
799-
"url"=>"https://api.github.com/octocat/Hello-World/git/blobs/f484d249c660418515fb01c2b9662073663c242e"
800+
"url"=>"https://api.github.com/repos/octocat/Hello-World/git/blobs/f484d249c660418515fb01c2b9662073663c242e"
800801
},
801802
{"path"=>"exec_file",
802803
"mode"=>"100755",
803804
"type"=>"blob",
804805
"size"=>75,
805806
"sha"=>"45b983be36b73c0788dc9cbcb76cbb80fc7bb057",
806-
"url"=>"https://api.github.com/octocat/Hello-World/git/blobs/45b983be36b73c0788dc9cbcb76cbb80fc7bb057",
807+
"url"=>"https://api.github.com/repos/octocat/Hello-World/git/blobs/45b983be36b73c0788dc9cbcb76cbb80fc7bb057",
807808
}
808809
]
809810
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp