<p>This adds support for Twitter and GitHub login - will need the normal legal review of terms.</p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/openstreetmap/openstreetmap-website/pull/989'>https://github.com/openstreetmap/openstreetmap-website/pull/989</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Add support for Twitter authentication</li>
  <li>Add support for GitHub authentication</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-0">Gemfile</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-1">Gemfile.lock</a>
    (11)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-2">app/assets/images/github.png</a>
    (0)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-3">app/assets/images/twitter.png</a>
    (0)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-4">app/views/user/login.html.erb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-5">config/example.application.yml</a>
    (8)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-6">config/initializers/omniauth.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-7">config/locales/en.yml</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-8">lib/auth.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-9">test/controllers/user_controller_test.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-10">test/fixtures/users.yml</a>
    (28)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-11">test/integration/user_creation_test.rb</a>
    (228)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-12">test/integration/user_login_test.rb</a>
    (178)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989/files#diff-13">test/models/user_test.rb</a>
    (6)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/989.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/989.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/989.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/989.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/openstreetmap/openstreetmap-website/pull/989">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABWnLbq9-QE0NN39jVN5MMlpcqv4YMg4ks5oRbapgaJpZM4E75Rk.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
  <div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
    <link itemprop="url" href="https://github.com/openstreetmap/openstreetmap-website/pull/989"></link>
    <meta itemprop="name" content="View Pull Request"></meta>
  </div>
  <meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>