Resolve merge conflict

gjtorikian · gjtorikian · commit 9821655d18d0 · 2014-12-09T10:18:15.000-08:00
diff --git a/content/changes/2014-12-09-new-attributes-for-stars-api.md b/content/changes/2014-12-09-new-attributes-for-stars-api.md
@@ -0,0 +1,19 @@
+---
+kind: change
+title: New Attributes for Starring API
+created_at: 2014-12-09
+author_name: arfon
+---
+
+You can now see when a user starred a repository. To receive the new response format containing the `starred_at` field, request the new media type:
+
+    curl -H "Accept: application/vnd.github.v3.star+json" https://api.github.com/users/andrew/starred
+
+Note the starred repository is now available in the repo field.
+
+### Feedback
+
+If you have any questions or feedback about these changes, please [drop us a line][contact].
+
+[starring]: /v3/activity/starring/#list-repositories-being-starred-with-star-creation-timestamps
+[contact]: https://github.com/contact?form[subject]=New+Attributes+for+Starring+API
diff --git a/content/v3/activity/starring.md b/content/v3/activity/starring.md
@@ -47,12 +47,21 @@ Name | Type | Description
 `sort`|`string` | One of `created` (when the repository was starred) or `updated` (when it was last pushed to). Default: `created`
 `direction`|`string` | One of `asc` (ascending) or `desc` (descending). Default: `desc`
 
-
 ### Response
 
 <%= headers 200, :pagination => default_pagination_rels %>
 <%= json(:repo) { |h| [h] } %>
 
+## List repositories being starred with star creation timestamps
+
+You can also find out _when_ stars were created by passing the following custom content-type via the `Accept` header.
+
+    Accept: application/vnd.github.v3.star+json
+
+### Response
+<%= headers 200, :pagination => default_pagination_rels %>
+<%= json(:starred_repo) { |hash| [hash] } %>
+
 ## Check if you are starring a repository
 
 Requires for the user to be authenticated.
diff --git a/lib/resources.rb b/lib/resources.rb
@@ -251,6 +251,11 @@ def fetch_content(key)
       "source"            => REPO
     })
 
+    STARRED_REPO ||= {
+      "starred_at" => "2011-01-16T19:06:43Z",
+      "repo" => REPO
+    }
+
     TAG ||= {
       "name"        => "v0.1",
       "commit"      => {
