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.

Commit113f02d

Browse files
committed
Merge branch 'master' into implement-redirects
2 parents543b7a2 +2dfbe8a commit113f02d

20 files changed

+51
-59
lines changed

‎.ruby-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Gemfile‎

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

3-
ruby'2.1.6'
4-
53
gem'builder'
64
gem'coderay'
75
gem'kramdown','~> 0.13.2'
@@ -10,7 +8,6 @@ gem 'nanoc', '~> 3.7'
108
gem'nokogiri','~> 1.6.0'
119
gem'rouge','~> 1.4'
1210
gem'rake','~> 0.9.2'
13-
gem'thin'
1411
gem'yajl-ruby','~> 0.8.2'
1512

1613
group:developmentdo

‎Gemfile.lock‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ GEM
1111
colored (1.2)
1212
cri (2.6.1)
1313
colored (~>1.2)
14-
daemons (1.1.9)
1514
ethon (0.7.4)
1615
ffi (>=1.3.0)
17-
eventmachine (1.0.3)
1816
ffi (1.9.10)
1917
formatador (0.2.5)
2018
fssm (0.2.10)
@@ -54,17 +52,13 @@ GEM
5452
coderay (~>1.1.0)
5553
method_source (~>0.8.1)
5654
slop (~>3.4)
57-
rack (1.5.2)
55+
rack (1.6.4)
5856
rake (0.9.6)
5957
rb-fsevent (0.9.4)
6058
rb-inotify (0.9.5)
6159
ffi (>=0.5.0)
6260
rouge (1.4.0)
6361
slop (3.6.0)
64-
thin (1.6.2)
65-
daemons (>=1.0.9)
66-
eventmachine (>=1.0.0)
67-
rack (>=1.0.0)
6862
thor (0.19.1)
6963
timers (1.1.0)
7064
typhoeus (0.7.3)
@@ -88,5 +82,7 @@ DEPENDENCIES
8882
nokogiri (~>1.6.0)
8983
rake (~>0.9.2)
9084
rouge (~>1.4)
91-
thin
9285
yajl-ruby (~>0.8.2)
86+
87+
BUNDLED WITH
88+
1.10.6

‎content/guides/building-a-ci-server.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,16 @@ Let's start with this:
4545

4646
(If you're unfamiliar with how Sinatra works, we recommend[reading the Sinatra guide][Sinatra].)
4747

48-
Start this server up. By default, Sinatra starts on port`9393`, so you'll want
48+
Start this server up. By default, Sinatra starts on port`4567`, so you'll want
4949
to configure ngrok to start listening for that, too.
5050

5151
In order for this server to work, we'll need to set a repository up with a webhook.
5252
The webhook should be configured to fire whenever a Pull Request is created, or merged.
5353
Go ahead and create a repository you're comfortable playing around in. Might we
5454
suggest[@octocat's Spoon/Knife repository](https://github.com/octocat/Spoon-Knife)?
5555
After that, you'll create a new webhook in your repository, feeding it the URL
56-
that ngrok gave you:
56+
that ngrok gave you, and choosing`application/x-www-form-urlencoded` as the
57+
content type:
5758

5859
![A new ngrok URL](/images/webhook_sample_url.png)
5960

‎content/guides/delivering-deployments.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,16 @@ Let's start with this:
4747

4848
(If you're unfamiliar with how Sinatra works, we recommend[reading the Sinatra guide][Sinatra].)
4949

50-
Start this server up. By default, Sinatra starts on port`9393`, so you'll want
50+
Start this server up. By default, Sinatra starts on port`4567`, so you'll want
5151
to configure ngrok to start listening for that, too.
5252

5353
In order for this server to work, we'll need to set a repository up with a webhook.
5454
The webhook should be configured to fire whenever a Pull Request is created, or merged.
5555
Go ahead and create a repository you're comfortable playing around in. Might we
5656
suggest[@octocat's Spoon/Knife repository](https://github.com/octocat/Spoon-Knife)?
5757
After that, you'll create a new webhook in your repository, feeding it the URL
58-
that ngrok gave you:
58+
that ngrok gave you, and choosing`application/x-www-form-urlencoded` as the
59+
content type:
5960

6061
![A new ngrok URL](/images/webhook_sample_url.png)
6162

‎content/v3/gists.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ The keys in the `files` object are the `string` filename. The value is another `
126126
"delete_this_file.txt" => nil,
127127
} %>
128128

129-
<divclass="alert">
130-
<p>
131-
<strong>Note</strong>: All files from the previous version of the gist are carried over by default if not included in the object. Deletes can be performed by including the filename with a <code>null</code> object.
132-
</p>
133-
</div>
129+
{{#tip}}
130+
131+
<strong>Note</strong>: All files from the previous version of the gist are carried over by default if not included in the object. Deletes can be performed by including the filename with a <code>null</code> object.
132+
133+
{{/tip}}
134134

135135

136136
###Response

‎content/v3/orgs/migrations.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ title: Migrations | GitHub API
77
* TOC
88
{:toc}
99

10+
{{#enterprise-only}}
11+
12+
{{#warning}}
13+
14+
This API is not currently available on GitHub Enterprise.
15+
16+
{{/warning}}
17+
18+
{{/enterprise-only}}
19+
1020
{{#tip}}
1121

1222
To access the Migrations API, you must provide a custom[media type](/v3/media) in the`Accept` header:

‎content/v3/repos/downloads.md‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@ title: Downloads | GitHub API
99

1010
###Downloads API is Deprecated
1111

12-
<divclass="alert">
13-
<p>
14-
The Downloads API (described below) was
15-
<a href="https://github.com/blog/1302-goodbye-uploads">deprecated on December 11, 2012</a>.
16-
It will be removed at a future date.
17-
18-
We recommend using <a href="/v3/repos/releases/">Releases</a> instead.
19-
</p>
20-
</div>
12+
{{#warning}}
13+
14+
The Downloads API (described below) was <ahref="https://github.com/blog/1302-goodbye-uploads">deprecated on December 11, 2012</a>. It will be removed at a future date.
15+
16+
We recommend using <ahref="/v3/repos/releases/">Releases</a> instead.
17+
18+
{{/warning}}
2119

2220
The downloads API is for package downloads only. If you want to get
2321
source tarballs you should use[this](/v3/repos/contents/#get-archive-link)

‎content/v3/search/legacy.md‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ v3. There should be no changes, other than the new URL and JSON output format.
1212

1313
###Legacy Search API is Deprecated
1414

15-
<divclass="alert">
16-
<p>
17-
The Legacy Search API (described below) is <a href="/v3/versions/#v3-deprecations">deprecated</a>
18-
and is scheduled for removal in the next major version of the API.
19-
20-
We recommend using the <a href="/v3/search/">v3 Search API</a> instead.
21-
It contains new endpoints and much more functionality.
22-
</p>
23-
</div>
15+
{{#warning}}
16+
17+
The Legacy Search API (described below) is <ahref="/v3/versions/#v3-deprecations">deprecated</a> and is scheduled for removal in the next major version of the API.
18+
19+
We recommend using the <ahref="/v3/search/">v3 Search API</a> instead. It contains new endpoints and much more functionality.
20+
21+
{{/warning}}
2422

2523
##Search issues
2624

‎content/v3/versions.md‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -125,23 +125,15 @@ The recommendations below will help you prepare your application for the next ma
125125

126126
The[beta API](/v3) is deprecated. Its current functionality is stable, and we strive to ensure that any[changes](/changes) are backwards compatible. Please[file a support issue][support] if you have problems.
127127

128-
<divclass="alert">
129-
<p>
130-
<strong>Note</strong>: We recommend using the <a href="#v3">v3 API</a>
131-
instead of the deprecated beta version of the API.
132-
</p>
133-
<p>
134-
The beta media type differs from the v3 media type in
135-
<a href="#differences-from-beta-version">just a few places</a>. In most
136-
cases, migrating an application from the beta media type to the v3 media
137-
type is smooth and painless.
138-
</p>
139-
<p>
140-
We will eventually retire the beta version, but we have no official
141-
retirement date to announce at the moment. When the time comes, rest assured
142-
that we'll announce the retirement with plenty of notice.
143-
</p>
144-
</div>
128+
{{#tip}}
129+
130+
<strong>Note</strong>: We recommend using the <ahref="#v3">v3 API</a> instead of the deprecated beta version of the API.
131+
132+
The beta media type differs from the v3 media type in <ahref="#differences-from-beta-version">just a few places</a>. In most cases, migrating an application from the beta media type to the v3 media type is smooth and painless.
133+
134+
We will eventually retire the beta version, but we have no official retirement date to announce at the moment. When the time comes, rest assured that we'll announce the retirement with plenty of notice.
135+
136+
{{/tip}}
145137

146138
##Breaking beta changes
147139

0 commit comments

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