Sync changes from upstream repository

Hubot · Hubot · commit 1558befe563f · 2015-10-26T17:17:20.000Z
diff --git a/Rules b/Rules
@@ -13,6 +13,7 @@
 # Reset search-index by deleting it every time
 preprocess do
   File.delete("output/search-index.json") if File.exists?("output/search-index.json")
+  generate_redirects(config[:redirects])
 end
 
 compile '/static/*' do
diff --git a/config.yaml b/config.yaml
@@ -57,3 +57,13 @@ api_versions:
     - 2011-4-27
   -
     - v3
+
+redirects:
+  - /changes/2012-9-5-watcher-api/: /changes/2012-09-05-watcher-api/
+  - /changes/2012-9-28-auto-init-for-repositories/: /changes/2012-09-28-auto-init-for-repositories/
+  - /changes/2013-2-5-changes-to-services/: /changes/2013-02-05-changes-to-services/
+  - /changes/2013-2-13-hookshot-issues/: /changes/2013-02-13-hookshot-issues/
+  - /changes/2013-2-13-hookshot-load-balancer/: /changes/2013-02-13-hookshot-load-balancer/
+  - /changes/2013-2-13-sortable-stars/: /changes/2013-02-14-sortable-stars/
+  - /changes/2013-3-1-new-hookshot-coming/: /changes/2013-03-01-new-hookshot-coming/
+  - /changes/2014-2-10-ping-event-for-webhooks/: /changes/2014-02-10-ping-event-for-webhooks/
diff --git a/content/changes/2012-09-05-watcher-api.html b/content/changes/2012-09-05-watcher-api.html
@@ -1,7 +1,7 @@
 ---
 kind: change
 title: Upcoming Changes to Watcher and Star APIs
-created_at: 2012-9-5
+created_at: 2012-09-05
 author_name: technoweenie
 ---
 
diff --git a/content/changes/2012-09-28-auto-init-for-repositories.html b/content/changes/2012-09-28-auto-init-for-repositories.html
@@ -1,7 +1,7 @@
 ---
 kind: change
 title: Initialize a repository when creating
-created_at: 2012-9-28
+created_at: 2012-09-28
 author_name: pengwynn
 ---
 
@@ -45,4 +45,3 @@
 [twitter]: https://twitter.com/githubapi
 [email]: mailto:support@github.com
 [c]: https://github.com/c
-
diff --git a/content/changes/2012-11-29-gitignore-templates.html b/content/changes/2012-11-29-gitignore-templates.html
@@ -54,7 +54,7 @@
     DerivedData
     .idea/
 
-[init-post]: /changes/2012-9-28-auto-init-for-repositories/
+[init-post]: /changes/2012-09-28-auto-init-for-repositories/
 [repo-create]: /v3/repos/#create
 [templates-repo]: https://github.com/github/gitignore
 [new-api]: /v3/gitignore/
diff --git a/content/changes/2013-02-05-changes-to-services.html b/content/changes/2013-02-05-changes-to-services.html
@@ -1,7 +1,7 @@
 ---
 kind: change
 title: Upcoming Changes to GitHub Services
-created_at: 2013-2-5
+created_at: 2013-02-05
 author_name: technoweenie
 ---
 
diff --git a/content/changes/2013-02-13-hookshot-issues.html b/content/changes/2013-02-13-hookshot-issues.html
@@ -1,7 +1,7 @@
 ---
 kind: change
 title: Some Hookshot Issues
-created_at: 2013-2-13T11:00:00
+created_at: 2013-02-13T11:00:00
 author_name: technoweenie
 ---
 
@@ -17,4 +17,3 @@
 
 We're currently working on solving this problem.  Hit up [support@github.com](mailto:support@github.com)
 if you have any questions.
-
diff --git a/content/changes/2013-02-13-hookshot-load-balancer.html b/content/changes/2013-02-13-hookshot-load-balancer.html
@@ -1,7 +1,7 @@
 ---
 kind: change
 title: Hookshot Load balancer
-created_at: 2013-2-13T12:00:00
+created_at: 2013-02-13T12:00:00
 author_name: technoweenie
 ---
 
diff --git a/content/changes/2013-02-14-sortable-stars.html b/content/changes/2013-02-14-sortable-stars.html
@@ -1,7 +1,7 @@
 ---
 kind: change
 title: Sortable Stars in Repository Starring API
-created_at: 2013-2-14
+created_at: 2013-02-14
 author_name: pengwynn
 ---
 
diff --git a/content/changes/2013-03-01-new-hookshot-coming.html b/content/changes/2013-03-01-new-hookshot-coming.html
@@ -1,7 +1,7 @@
 ---
 kind: change
 title: New Hookshot Changes
-created_at: 2013-3-1
+created_at: 2013-03-01
 author_name: technoweenie
 ---
 
@@ -22,4 +22,3 @@
 
 This also means we should be able to start accepting [GitHub Services pull
 requests](https://github.com/github/github-services/pulls) very soon :)
-
diff --git a/content/changes/2014-02-10-ping-event-for-webhooks.html b/content/changes/2014-02-10-ping-event-for-webhooks.html
diff --git a/content/v3/activity/events/types.md b/content/v3/activity/events/types.md
@@ -519,7 +519,7 @@ Key | Type | Description
 ## WatchEvent
 
 The WatchEvent is related to [starring a repository](/v3/activity/starring/#star-a-repository), not [watching](/v3/activity/watching/).
-See [this API blog post](/changes/2012-9-5-watcher-api/) for an explanation.
+See [this API blog post](/changes/2012-09-05-watcher-api/) for an explanation.
 
 The event’s actor is the [user](/v3/users/) who starred a repository, and the
 event’s repository is the [repository](/v3/repos/) that was starred.
diff --git a/content/v3/activity/starring.md b/content/v3/activity/starring.md
@@ -18,7 +18,7 @@ In August 2012, we [changed the way watching
 works](https://github.com/blog/1204-notifications-stars) on GitHub.  Many API
 client applications may be using the original "watcher" endpoints for accessing
 this data. You can now start using the "star" endpoints instead (described
-below). Check out the [Watcher API Change post](/changes/2012-9-5-watcher-api/)
+below). Check out the [Watcher API Change post](/changes/2012-09-05-watcher-api/)
 for more details.
 
 ## List Stargazers
diff --git a/content/v3/activity/watching.md b/content/v3/activity/watching.md
@@ -21,7 +21,7 @@ legacy "watcher" endpoints continue to provide starring data.
 
 To provide access to watching data, the v3 Watcher API uses the "subscription"
 endpoints described below. Check out the [Watcher API Change
-post](/changes/2012-9-5-watcher-api/) for more details.
+post](/changes/2012-09-05-watcher-api/) for more details.
 
 ## List watchers
 
diff --git a/layouts/redirect.html b/layouts/redirect.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Redirecting...</title>
+<link rel=canonical href="<%= @new_url %>">
+<meta http-equiv=refresh content="0; url=<%= @new_url %>">
+<h1>Redirecting...</h1>
+<a href="<%= @new_url %>">Click here if you are not redirected.</a>
+<script>location='<%= @new_url %>'</script>
diff --git a/lib/redirect_generator.rb b/lib/redirect_generator.rb
@@ -0,0 +1,17 @@
+module RedirectGenerator
+  def generate_redirects(redirects)
+    redirects.each do |pairs|
+      pairs.each_pair do |old_url, new_url|
+        @items << Nanoc::Item.new(
+          "<%= render 'redirect',
+            { :new_url => '#{new_url}' }
+          %>",
+          {},
+          old_url.to_s
+        )
+      end
+    end
+  end
+end
+
+include RedirectGenerator
diff --git a/lib/resources.rb b/lib/resources.rb
@@ -35,6 +35,7 @@ def post_date(item)
       end
 
       def strftime(time, format = DefaultTimeFormat)
+        return "" if time.nil?
         attribute_to_time(time).strftime(format)
       end
 
