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

Commit5ef685d

Browse files
committed
Merge pull requestgithub#890 from github/update-1445879840
2 parents0e4bf53 +1558bef commit5ef685d

17 files changed

+48
-14
lines changed

‎Rules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# Reset search-index by deleting it every time
1414
preprocessdo
1515
File.delete("output/search-index.json")ifFile.exists?("output/search-index.json")
16+
generate_redirects(config[:redirects])
1617
end
1718

1819
compile'/static/*'do

‎config.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,13 @@ api_versions:
5757
-2011-4-27
5858
-
5959
-v3
60+
61+
redirects:
62+
-/changes/2012-9-5-watcher-api/:/changes/2012-09-05-watcher-api/
63+
-/changes/2012-9-28-auto-init-for-repositories/:/changes/2012-09-28-auto-init-for-repositories/
64+
-/changes/2013-2-5-changes-to-services/:/changes/2013-02-05-changes-to-services/
65+
-/changes/2013-2-13-hookshot-issues/:/changes/2013-02-13-hookshot-issues/
66+
-/changes/2013-2-13-hookshot-load-balancer/:/changes/2013-02-13-hookshot-load-balancer/
67+
-/changes/2013-2-13-sortable-stars/:/changes/2013-02-14-sortable-stars/
68+
-/changes/2013-3-1-new-hookshot-coming/:/changes/2013-03-01-new-hookshot-coming/
69+
-/changes/2014-2-10-ping-event-for-webhooks/:/changes/2014-02-10-ping-event-for-webhooks/

‎content/changes/2012-9-5-watcher-api.htmlrenamed to‎content/changes/2012-09-05-watcher-api.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
kind: change
33
title: Upcoming Changes to Watcher and Star APIs
4-
created_at: 2012-9-5
4+
created_at: 2012-09-05
55
author_name: technoweenie
66
---
77

‎content/changes/2012-9-28-auto-init-for-repositories.htmlrenamed to‎content/changes/2012-09-28-auto-init-for-repositories.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
kind: change
33
title: Initialize a repository when creating
4-
created_at: 2012-9-28
4+
created_at: 2012-09-28
55
author_name: pengwynn
66
---
77

@@ -45,4 +45,3 @@
4545
[twitter]: https://twitter.com/githubapi
4646
[email]: mailto:support@github.com
4747
[c]: https://github.com/c
48-

‎content/changes/2012-11-29-gitignore-templates.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
DerivedData
5555
.idea/
5656

57-
[init-post]: /changes/2012-9-28-auto-init-for-repositories/
57+
[init-post]: /changes/2012-09-28-auto-init-for-repositories/
5858
[repo-create]: /v3/repos/#create
5959
[templates-repo]: https://github.com/github/gitignore
6060
[new-api]: /v3/gitignore/

‎content/changes/2013-2-5-changes-to-services.htmlrenamed to‎content/changes/2013-02-05-changes-to-services.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
kind: change
33
title: Upcoming Changes to GitHub Services
4-
created_at: 2013-2-5
4+
created_at: 2013-02-05
55
author_name: technoweenie
66
---
77

‎content/changes/2013-2-13-hookshot-issues.htmlrenamed to‎content/changes/2013-02-13-hookshot-issues.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
kind: change
33
title: Some Hookshot Issues
4-
created_at: 2013-2-13T11:00:00
4+
created_at: 2013-02-13T11:00:00
55
author_name: technoweenie
66
---
77

@@ -17,4 +17,3 @@
1717

1818
We're currently working on solving this problem. Hit up [support@github.com](mailto:support@github.com)
1919
if you have any questions.
20-

‎content/changes/2013-2-13-hookshot-load-balancer.htmlrenamed to‎content/changes/2013-02-13-hookshot-load-balancer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
kind: change
33
title: Hookshot Load balancer
4-
created_at: 2013-2-13T12:00:00
4+
created_at: 2013-02-13T12:00:00
55
author_name: technoweenie
66
---
77

‎content/changes/2013-2-13-sortable-stars.htmlrenamed to‎content/changes/2013-02-14-sortable-stars.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
kind: change
33
title: Sortable Stars in Repository Starring API
4-
created_at: 2013-2-14
4+
created_at: 2013-02-14
55
author_name: pengwynn
66
---
77

‎content/changes/2013-3-1-new-hookshot-coming.htmlrenamed to‎content/changes/2013-03-01-new-hookshot-coming.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
kind: change
33
title: New Hookshot Changes
4-
created_at: 2013-3-1
4+
created_at: 2013-03-01
55
author_name: technoweenie
66
---
77

@@ -22,4 +22,3 @@
2222

2323
This also means we should be able to start accepting [GitHub Services pull
2424
requests](https://github.com/github/github-services/pulls) very soon :)
25-

‎content/v3/activity/events/types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ Key | Type | Description
519519
##WatchEvent
520520

521521
The WatchEvent is related to[starring a repository](/v3/activity/starring/#star-a-repository), not[watching](/v3/activity/watching/).
522-
See[this API blog post](/changes/2012-9-5-watcher-api/) for an explanation.
522+
See[this API blog post](/changes/2012-09-05-watcher-api/) for an explanation.
523523

524524
The event’s actor is the[user](/v3/users/) who starred a repository, and the
525525
event’s repository is the[repository](/v3/repos/) that was starred.

‎content/v3/activity/starring.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ In August 2012, we [changed the way watching
1818
works](https://github.com/blog/1204-notifications-stars) on GitHub. Many API
1919
client applications may be using the original "watcher" endpoints for accessing
2020
this data. You can now start using the "star" endpoints instead (described
21-
below). Check out the[Watcher API Change post](/changes/2012-9-5-watcher-api/)
21+
below). Check out the[Watcher API Change post](/changes/2012-09-05-watcher-api/)
2222
for more details.
2323

2424
##List Stargazers

‎content/v3/activity/watching.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ legacy "watcher" endpoints continue to provide starring data.
2121

2222
To provide access to watching data, the v3 Watcher API uses the "subscription"
2323
endpoints described below. Check out the[Watcher API Change
24-
post](/changes/2012-9-5-watcher-api/) for more details.
24+
post](/changes/2012-09-05-watcher-api/) for more details.
2525

2626
##List watchers
2727

‎layouts/redirect.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!DOCTYPE html>
2+
<metacharset=utf-8>
3+
<title>Redirecting...</title>
4+
<linkrel=canonicalhref="<%= @new_url %>">
5+
<metahttp-equiv=refreshcontent="0; url=<%= @new_url %>">
6+
<h1>Redirecting...</h1>
7+
<ahref="<%= @new_url %>">Click here if you are not redirected.</a>
8+
<script>location='<%= @new_url %>'</script>

‎lib/redirect_generator.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
moduleRedirectGenerator
2+
defgenerate_redirects(redirects)
3+
redirects.eachdo |pairs|
4+
pairs.each_pairdo |old_url,new_url|
5+
@items <<Nanoc::Item.new(
6+
"<%= render 'redirect',
7+
{ :new_url => '#{new_url}' }
8+
%>",
9+
{},
10+
old_url.to_s
11+
)
12+
end
13+
end
14+
end
15+
end
16+
17+
includeRedirectGenerator

‎lib/resources.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ def post_date(item)
3535
end
3636

3737
defstrftime(time,format=DefaultTimeFormat)
38+
return""iftime.nil?
3839
attribute_to_time(time).strftime(format)
3940
end
4041

0 commit comments

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