merge publi/master into internal/master

izuzak · izuzak · commit 118dfa564de5 · 2014-02-24T18:17:19.000+01:00
diff --git a/content/changes/2014-02-13-exposing-the-page-api.html b/content/changes/2014-02-13-exposing-the-page-api.html
@@ -5,7 +5,7 @@
 author_name: gjtorikian
 ---
 
-We've created [a new an API to GitHub Pages](/v3/repos/pages/). This API is accessible
+We've created [a new API to GitHub Pages](/v3/repos/pages/). This API is accessible
 by owners of a Pages repo, whether it's owned by an individual or an organization.
 
 With the Pages API, you can get information about your site, as well as details
diff --git a/content/changes/2014-02-19-repo-contributors-for-empty-repos.md b/content/changes/2014-02-19-repo-contributors-for-empty-repos.md
@@ -4,7 +4,7 @@ title: Repository Contributors and Empty Repositories
 created_at: 2014-02-20
 author_name: izuzak
 ---
-​
+
 We've made a small change to the [Repository Contributors API](/v3/repos/#list-contributors) in the way empty repositories are handled. Previously, the API returned a `404 Not Found` status when the list of contributors was fetched for an empty repository. To improve consistency with other API endpoints and reduce confusion, the API now returns a `204 No Content` status instead.
 
 If you notice any strangeness, [just let us know](https://github.com/contact?form%5Bsubject%5D=APIv3).
diff --git a/content/guides/basics-of-authentication.md b/content/guides/basics-of-authentication.md
@@ -175,7 +175,7 @@ We can do whatever we want with our results. In this case, we'll just dump them
     #!html+erb
     <p>Hello, <%= login %>!</p>
     <p>
-      <% if !email.empty? %> It looks like your public email address is <%= email %>.
+      <% if !email.nil? && !email.empty? %> It looks like your public email address is <%= email %>.
       <% else %> It looks like you don't have a public email. That's cool.
       <% end %>
     </p>
diff --git a/content/v3/activity/events/types.md b/content/v3/activity/events/types.md
@@ -36,6 +36,8 @@ Key | Type | Description
 
 Represents a created repository, branch, or tag.
 
+Note: webhooks will not receive this event for created repositories.
+
 ### Hook name
 
 `create`
diff --git a/content/v3/issues.md b/content/v3/issues.md
@@ -72,7 +72,7 @@ Name | Type | Description
 ### Response
 
 <%= headers 200 %>
-<%= json :issue %>
+<%= json :full_issue %>
 
 <div class="alert">
   <p>
@@ -111,7 +111,7 @@ Name | Type | Description
 <%= headers 201,
       :Location =>
 'https://api.github.com/repos/user/repo/issues/1' %>
-<%= json :issue %>
+<%= json :full_issue %>
 
 ## Edit an issue
 
@@ -145,7 +145,7 @@ Name | Type | Description
 ### Response
 
 <%= headers 200 %>
-<%= json :issue %>
+<%= json :full_issue %>
 
 ## Custom media types
 
diff --git a/content/v3/oauth.md b/content/v3/oauth.md
@@ -192,6 +192,7 @@ can specify multiple scopes by separating them with a comma:
       scope=user,public_repo
 
 ## Common errors for the authorization request
+<<<<<<< HEAD
 
 There are a few things that can go wrong in the process of obtaining an
 OAuth token for a user. In the initial authorization request phase,
@@ -260,6 +261,106 @@ match what you received in the first request for authorization you will
 receive this error.
 
 <%= json :error => :bad_verification_code %>
+=======
+
+There are a few things that can go wrong in the process of obtaining an
+OAuth token for a user. In the initial authorization request phase,
+these are some errors you might see:
+
+### Application Suspended
+
+If the OAuth application you set up has been suspended (due to reported
+abuse, spam, or a mis-use of the API), GitHub will redirect to the
+registered callback URL with the following parameters summerizing the
+error:
+
+    http://your-application.com/callback?error=application_suspended
+      &error_description=Your+application+has+been+suspended.+Contact+support@github.com.
+      &error_uri=http://developer.github.com/v3/oauth/%23application-suspended
+      &state=xyz
+
+Please contact [support](https://github.com/contact) to solve issues
+with suspended applications.
+
+### Redirect URI mismatch
+
+If you provide a redirect_uri that doesn't match what you've registered
+with your application, GitHub will redirect to the registered callback
+URL with the following parameters summerizing the error:
+
+    http://your-application.com/callback?error=redirect_uri_mismatch
+      &error_description=The+redirect_uri+MUST+match+the+registered+callback+URL+for+this+application.
+      &error_uri=http://developer.github.com/v3/oauth/%23redirect-uri-mismatch
+      &state=xyz
+
+To correct this error, either provide a redirect_uri that matches what
+you registered or leave out this parameter to use the default one
+registered with your application.
+
+### Access denied
+
+If the user rejects access to your application, GItHub will redirect to
+the registered callback URL with the following parameters summerizing
+the error:
+
+    http://your-application.com/callback?error=access_denied
+      &error_description=The+user+has+denied+your+application+access.
+      &error_uri=http://developer.github.com/v3/oauth/%23access-denied
+      &state=xyz
+
+There's nothing you can do here as users are free to choose not to use
+your application. More often that not, users will just close the window
+or press back in their browser, so it is likely that you'll never see
+this error.
+
+## Common errors for the access token request
+
+In the second phase of exchanging a code for an access token, there are
+an additional set of errors that can occur. The format of these
+responses is determined by the accept header you pass. The following
+examples only show JSON responses.
+
+### Incorrect client credentials
+
+If the client\_id and or client\_secret you pass are incorrect you will
+receive this error response.
+
+<%= json :error             => :incorrect_client_credentials,
+         :error_description => "The client_id and/or client_secret passed are incorrect.",
+         :error_uri         => "http://developer.github.com/v3/oauth/#incorrect-client-credentials"
+%>
+
+To solve this error, go back and make sure you have the correct
+credentials for your oauth application. Double check the `client_id` and
+`client_secret` to make sure they are correct and being passed correctly
+to GitHub.
+
+### Redirect URI mismatch(2)
+
+If you provide a redirect_uri that doesn't match what you've registered
+with your application, you will receive this error message:
+
+<%= json :error             => :redirect_uri_mismatch,
+         :error_description => "The redirect_uri MUST match the registered callback URL for this application.",
+         :error_uri         => "http://developer.github.com/v3/oauth/#redirect-uri-mismatch(2)"
+%>
+
+To correct this error, either provide a redirect_uri that matches what
+you registered or leave out this parameter to use the default one
+registered with your application.
+
+### Bad verification code
+
+If the verification code you pass is incorrect, expired, or doesn't
+match what you received in the first request for authorization you will
+receive this error.
+
+<%= json :error             => :bad_verification_code,
+         :error_description => "The code passed is incorrect or expired.",
+         :error_uri         => "http://developer.github.com/v3/oauth/#bad-verification-code"
+%>
+
+>>>>>>> master
 
 To solve this error, start the [OAuth process over from the beginning](#redirect-users-to-request-github-access)
 and get a new code.
diff --git a/lib/resources.rb b/lib/resources.rb
@@ -40,7 +40,7 @@ module Helpers
         :ymendel      => 'b1b1d33e0655e841d4fd8467359c58d0',
         :mastahyeti   => '8caa0afdae1a934c30a1998472c63134',
         :atmos        => 'a86224d72ce21cd9f5bee6784d4b06c7',
-        :kdaigle      => 'bc622cf1dc277323515fd4d7ed66ed24',
+        :kdaigle      => 'dd18bb36fa5f06e45843ff8de33b793e',
         :gjtorikian   => 'befd819b3fced8c6bd3dba7e633dd068',
         :izuzak       => 'ff743b4cba28cc47ad65cb90212c1e51',
         :spicycode    => '7ce90d712fab09421b7f2cf955b9a4c8'
@@ -731,6 +731,10 @@ def text_html(response, status, head = {})
       "updated_at" => "2011-04-22T13:33:48Z"
     }
 
+    FULL_ISSUE = ISSUE.merge({
+      "closed_by" => USER
+    })
+
     ISSUE_COMMENT = {
       "id"         => 1,
       "url"        => "https://api.github.com/repos/octocat/Hello-World/issues/comments/1",
@@ -1747,7 +1751,7 @@ def text_html(response, status, head = {})
     FEEDS = {
       :timeline_url => "https://github.com/timeline",
       :user_url => "https://github.com/{user}",
-      :current_user_public => "https://github.com/defunkt",
+      :current_user_public_url => "https://github.com/defunkt",
       :current_user_url => "https://github.com/defunkt.private?token=abc123",
       :current_user_actor_url => "https://github.com/defunkt.private.actor?token=abc123",
       :current_user_organization_url => "https://github.com/organizations/{org}/defunkt.private.atom?token=abc123",
diff --git a/static/search-index.json b/static/search-index.json
@@ -155,6 +155,11 @@
       "title": "OAuth",
       "section": "API/Overview"
     },
+    {
+      "url": "/v3/oauth_authorizations/",
+      "title": "Authorizations",
+      "section": "API/Overview"
+    },
     {
       "url": "/v3/orgs/",
       "title": "Organizations",
