<p>Update to rails 5.0.x (currently 5.0.3) and fix up things that have been deprecated or changed as necessary.</p>
<p>There's a test site at <a href="https://rails50.apis.dev.openstreetmap.org/">https://rails50.apis.dev.openstreetmap.org/</a> so please shout if you find any problems.</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/1561'>https://github.com/openstreetmap/openstreetmap-website/pull/1561</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Update to rails 5.0.3</li>
  <li>Update get/post etc to remove use of deprecated syntax</li>
  <li>Fix some tests for changes in rails 5</li>
  <li>Monkey patch oauth-plugin to avoid using deprecated methods</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-0">.rubocop_todo.yml</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-1">Gemfile</a>
    (11)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-2">Gemfile.lock</a>
    (146)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-3">Rakefile</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-4">app/controllers/application_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-5">app/controllers/changeset_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-6">app/controllers/user_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-7">app/views/layouts/_header.html.erb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-8">app/views/user/logout.html.erb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-9">config.ru</a>
    (3)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-10">config/application.rb</a>
    (15)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-11">config/boot.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-12">config/environments/development.rb</a>
    (23)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-13">config/environments/production.rb</a>
    (48)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-14">config/environments/test.rb</a>
    (14)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-15">config/initializers/cookies_serializer.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-16">config/initializers/oauth.rb</a>
    (39)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-17">config/secrets.yml</a>
    (16)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-18">db/seeds.rb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-19">db/structure.sql</a>
    (315)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-20">lib/tasks/testing.rake</a>
    (5)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-21">test/controllers/api_controller_test.rb</a>
    (38)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-22">test/controllers/browse_controller_test.rb</a>
    (22)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-23">test/controllers/changeset_controller_test.rb</a>
    (288)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-24">test/controllers/diary_entry_controller_test.rb</a>
    (240)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-25">test/controllers/export_controller_test.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-26">test/controllers/geocoder_controller_test.rb</a>
    (119)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-27">test/controllers/message_controller_test.rb</a>
    (80)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-28">test/controllers/node_controller_test.rb</a>
    (96)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-29">test/controllers/notes_controller_test.rb</a>
    (206)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-30">test/controllers/oauth_clients_controller_test.rb</a>
    (104)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-31">test/controllers/old_node_controller_test.rb</a>
    (54)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-32">test/controllers/old_relation_controller_test.rb</a>
    (52)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-33">test/controllers/old_way_controller_test.rb</a>
    (54)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-34">test/controllers/redactions_controller_test.rb</a>
    (24)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-35">test/controllers/relation_controller_test.rb</a>
    (110)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-36">test/controllers/search_controller_test.rb</a>
    (24)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-37">test/controllers/site_controller_test.rb</a>
    (80)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-38">test/controllers/swf_controller_test.rb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-39">test/controllers/trace_controller_test.rb</a>
    (222)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-40">test/controllers/user_blocks_controller_test.rb</a>
    (86)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-41">test/controllers/user_controller_test.rb</a>
    (229)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-42">test/controllers/user_preference_controller_test.rb</a>
    (18)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-43">test/controllers/user_roles_controller_test.rb</a>
    (28)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-44">test/controllers/way_controller_test.rb</a>
    (98)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-45">test/integration/client_applications_test.rb</a>
    (11)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-46">test/integration/cors_test.rb</a>
    (26)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-47">test/integration/oauth_test.rb</a>
    (56)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-48">test/integration/page_locale_test.rb</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-49">test/integration/user_blocks_test.rb</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-50">test/integration/user_changeset_comments_test.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-51">test/integration/user_creation_test.rb</a>
    (108)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-52">test/integration/user_diaries_test.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-53">test/integration/user_login_test.rb</a>
    (66)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-54">test/integration/user_roles_test.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561/files#diff-55">test/integration/user_terms_seen_test.rb</a>
    (12)
  </li>
</ul>

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

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1561">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABWnLYCJ_7sm_W5cwOgfr4KjQW3R1f8_ks5sDGHpgaJpZM4N2hcH">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABWnLeG24H5FGMWRUO8OzKOW_NJ8e_wYks5sDGHpgaJpZM4N2hcH.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/1561"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/openstreetmap/openstreetmap-website","title":"openstreetmap/openstreetmap-website","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/openstreetmap/openstreetmap-website"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Update to rails 5.0.x (#1561)"}],"action":{"name":"View Pull Request","url":"https://github.com/openstreetmap/openstreetmap-website/pull/1561"}}}</script>