Merge branch 'master' into bug/3163-markdown-xss

2017-06-01 09:47:12 -07:00
parent df47e0e956 5752ffcdab
commit 6ae7eb4591
13 changed files with 6999 additions and 77 deletions
--- a/src/core/components/auth/oauth2.jsx
+++ b/src/core/components/auth/oauth2.jsx
@@ -141,8 +141,8 @@ export default class Oauth2 extends React.Component {
                  isAuthorized ? <code> { this.state.passwordType } </code>
                    : <Col tablet={10} desktop={10}>
                      <select id="password_type" data-name="passwordType" onChange={ this.onInputChange }>
-                        <option value="basic">Basic auth</option>
                        <option value="request-body">Request body</option>
+                        <option value="basic">Basic auth</option>
                        <option value="query">Query parameters</option>
                      </select>
                    </Col>