Skip to content

Commit e083de2

Browse files
committed
Merge remote-tracking branch 'origin/master' into releases-api
2 parents da46d92 + a30692f commit e083de2

File tree

93 files changed

+3591
-554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+3591
-554
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
source "http://rubygems.org"
22

3+
ruby '1.9.3'
4+
35
gem 'builder'
46
gem 'coderay'
57
gem 'kramdown', '~> 0.13.2'

Gemfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@ GEM
33
specs:
44
adsf (1.1.1)
55
rack (>= 1.0.0)
6-
blankslate (2.1.2.4)
7-
builder (3.1.3)
8-
coderay (1.0.6)
6+
blankslate (3.1.2)
7+
builder (3.2.2)
8+
coderay (1.0.9)
99
colored (1.2)
1010
cri (2.3.0)
1111
colored (>= 1.2)
12-
daemons (1.1.8)
13-
eventmachine (1.0.0.rc.4)
12+
daemons (1.1.9)
13+
eventmachine (1.0.3)
1414
ffi (1.0.11)
15-
fssm (0.2.9)
16-
kramdown (0.13.7)
17-
mime-types (1.18)
15+
fssm (0.2.10)
16+
kramdown (0.13.8)
17+
mime-types (1.23)
1818
nanoc (3.4.3)
1919
cri (~> 2.2)
2020
nokogiri (1.4.7)
21-
pygments.rb (0.2.12)
21+
pygments.rb (0.2.13)
2222
rubypython (~> 0.5.3)
23-
rack (1.4.1)
24-
rake (0.9.2.2)
23+
rack (1.5.2)
24+
rake (0.9.6)
2525
rubypython (0.5.3)
2626
blankslate (>= 2.1.2.3)
2727
ffi (~> 1.0.7)
28-
thin (1.4.1)
28+
thin (1.5.1)
2929
daemons (>= 1.0.9)
3030
eventmachine (>= 0.12.6)
3131
rack (>= 1.0.0)

Rules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ end
3232
end
3333
end
3434

35+
compile '/guides/*' do
36+
filter :kramdown, :toc_levels => [2]
37+
filter :erb
38+
layout 'default'
39+
end
40+
3541
compile '*' do
3642
filter :erb
3743
filter :kramdown, :toc_levels => [2]
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+
[[email protected]](mailto:[email protected]?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+
[[email protected]](mailto:[email protected]?subject=Deprecating merge_commit_sha).
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
kind: change
3+
title: Improved Support for Submodules in the Repository Contents API
4+
created_at: 2013-04-30
5+
author_name: jasonrudolph
6+
---
7+
8+
When you view a repository with a submodule on github.com, you get useful links and information for the submodule.
9+
10+
[![Repository Contents with Submodule](/images/posts/submodule-links.png)][screenshot]
11+
12+
Today we're making that data available in the [Repository Contents API][docs].
13+
14+
<pre class="terminal">
15+
curl https://api.github.com/repos/jquery/jquery/contents/test/qunit
16+
17+
{
18+
"name": "qunit",
19+
"path": "test/qunit",
20+
"type": "submodule",
21+
"submodule_git_url": "git://github.com/jquery/qunit.git",
22+
"sha": "6ca3721222109997540bd6d9ccd396902e0ad2f9",
23+
"size": 0,
24+
"url": "https://api.github.com/repos/jquery/jquery/contents/test/qunit?ref=master",
25+
"git_url": "https://api.github.com/repos/jquery/qunit/git/trees/6ca3721222109997540bd6d9ccd396902e0ad2f9",
26+
"html_url": "https://github.com/jquery/qunit/tree/6ca3721222109997540bd6d9ccd396902e0ad2f9",
27+
"_links": {
28+
"self": "https://api.github.com/repos/jquery/jquery/contents/test/qunit?ref=master",
29+
"git": "https://api.github.com/repos/jquery/qunit/git/trees/6ca3721222109997540bd6d9ccd396902e0ad2f9",
30+
"html": "https://github.com/jquery/qunit/tree/6ca3721222109997540bd6d9ccd396902e0ad2f9"
31+
}
32+
}
33+
</pre>
34+
35+
If you have any questions or feedback, please drop us a line at
36+
[[email protected]](mailto:[email protected]?subject=Submodules in Repository Contents API).
37+
38+
[docs]: /v3/repos/contents/#get-contents
39+
[screenshot]: /images/posts/submodule-links.png
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
kind: change
3+
title: Commit Statuses Now Available for Branches and Tags
4+
created_at: 2013-04-30
5+
author_name: foca
6+
---
7+
8+
Last week we announced [support for build statuses in the branches page][blog].
9+
Now we are extending this to the API. The [API endpoint for commit statuses][doc]
10+
has been extended to allow branch and tag names, as well as commit SHAs.
11+
12+
<pre class="terminal">
13+
curl https://api.github.com/repos/rails/rails/statuses/3-2-stable
14+
</pre>
15+
16+
Enjoy.
17+
18+
[blog]: https://github.com/blog/1484-check-the-status-of-your-branches
19+
[doc]: http://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
kind: change
3+
title: Create, update, and delete individual files
4+
created_at: 2013-05-06
5+
author_name: ymendel
6+
---
7+
8+
We're following in the footsteps of GitHub.com's ability to [edit][web_edit] and
9+
[create][web_create] files in your web browser. Starting today, the
10+
[Repository Contents API][docs] will let you easily [create][], [update][], and even
11+
[delete][] individual files.
12+
13+
Happy editing!
14+
15+
16+
[web_edit]: https://github.com/blog/143-inline-file-editing
17+
[web_create]: https://github.com/blog/1327-creating-files-on-github
18+
19+
[docs]: /v3/repos/contents/
20+
[create]: /v3/repos/contents/#create-a-file
21+
[update]: /v3/repos/contents/#update-a-file
22+
[delete]: /v3/repos/contents/#delete-a-file
23+
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
kind: change
3+
title: Repository Statistics
4+
created_at: 2013-05-06
5+
author_name: Caged
6+
---
7+
8+
Today we're happy to open our [Repository Statistics API](/v3/repos/statistics) to everyone. We're using
9+
repository statistics to power [our graphs](https://github.com/github/linguist/graphs),
10+
but we can't wait to see what others can do with this information.
11+
12+
Starting today, these resources are available to you:
13+
14+
* **[Contributors](/v3/repos/statistics/#get-contributors-list-with-additions-deletions-and-commit-counts)**
15+
* **[Commit Activity](/v3/repos/statistics/#get-the-last-year-of-commit-activity-data)**
16+
* **[Code Frequency](/v3/repos/statistics/#get-the-number-of-additions-and-deletions-per-week)**
17+
* **[Participation](/v3/repos/statistics/#get-the-weekly-commit-count-for-the-repo-owner-and-everyone-else)**
18+
* **[Punch Card](/v3/repos/statistics/#get-the-number-of-commits-per-hour-in-each-day)**
19+
20+
Enjoy!
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
kind: change
3+
title: Feeds API
4+
created_at: 2013-7-01
5+
author_name: pengwynn
6+
---
7+
8+
Today we're releasing a new [Feeds API][], an easy way to list all the Atom
9+
resources available to the authenticated user.
10+
11+
<pre class='terminal'>
12+
13+
curl -u defunkt https://api.github.com/feeds
14+
15+
{
16+
"timeline_url": "https://github.com/timeline",
17+
"user_url": "https://github.com/{user}",
18+
"current_user_public_url": "https://github.com/defunkt",
19+
"current_user_url": "https://github.com/defunkt.private?token=abc123",
20+
"current_user_actor_url": "https://github.com/defunkt.private.actor?token=abc123",
21+
"current_user_organization_url": "https://github.com/organizations/{org}/defunkt.private.atom?token=abc123",
22+
"_links": {
23+
"timeline": {
24+
"href": "https://github.com/timeline",
25+
"type": "application/atom+xml"
26+
},
27+
"user": {
28+
"href": "https://github.com/{user}",
29+
"type": "application/atom+xml"
30+
},
31+
"current_user_public": {
32+
"href": "https://github.com/defunkt",
33+
"type": "application/atom+xml"
34+
},
35+
"current_user": {
36+
"href": "https://github.com/defunkt.private?token=abc123",
37+
"type": "application/atom+xml"
38+
},
39+
"current_user_actor": {
40+
"href": "https://github.com/defunkt.private.actor?token=abc123",
41+
"type": "application/atom+xml"
42+
},
43+
"current_user_organization": {
44+
"href": "https://github.com/organizations/{org}/defunkt.private.atom?token=abc123",
45+
"type": "application/atom+xml"
46+
}
47+
}
48+
}
49+
50+
</pre>
51+
52+
If you have any questions or feedback, [please drop us a line][contact].
53+
54+
[Feeds API]: /v3/activity/feeds/
55+
[contact]: https://github.com/contact?form[subject]=Feeds%20API
56+

0 commit comments

Comments
 (0)