<p>This is a first cut at updating to rails 6 now that 6.0.1 is available which resolves a bug that was affecting us.</p>
<p>I have dropped <code>record_tag_helper</code> which we were only using in one place and which is still awaiting a new release.</p>
<p>The other thing where a new release is pending is <code>actionpack-page_caching</code> so I have disabled that for now so that we can get on with testing as it is only used as an optimisation in production for the embed page.</p>
<p>A test site is deployed at <a rel="nofollow" href="https://rails6.apis.dev.openstreetmap.org/">https://rails6.apis.dev.openstreetmap.org/</a> so that we can give it the once over.</p>
<p><span class="issue-keyword tooltipped tooltipped-se" aria-label="This pull request closes issue #2352.">Fixes</span> <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="483280350" data-permission-text="Issue title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/2352" data-hovercard-type="issue" data-hovercard-url="/openstreetmap/openstreetmap-website/issues/2352/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/issues/2352">#2352</a></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/2423'>https://github.com/openstreetmap/openstreetmap-website/pull/2423</a></p>
<h4>Commit Summary</h4>
<ul>
<li>Disable page caching</li>
<li>Update to rails 6.0.1</li>
<li>Fix some deprecation warnings</li>
<li>Errors have text/plain as the content type</li>
<li>Drop use of record_tag_helper</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-0">Gemfile</a>
(17)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-1">Gemfile.lock</a>
(144)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-2">app/controllers/export_controller.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-3">app/mailers/notifier.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-4">app/views/oauth_clients/index.html.erb</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-5">bin/setup</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-6">config/environments/development.rb</a>
(7)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-7">config/environments/production.rb</a>
(39)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-8">config/environments/test.rb</a>
(20)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-9">config/initializers/active_storage.rb</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-10">config/initializers/assets.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-11">config/initializers/content_security_policy.rb</a>
(5)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-12">config/initializers/cors.rb</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-13">config/initializers/field_error.rb</a>
(2)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-14">config/initializers/new_framework_defaults_5_2.rb</a>
(38)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-15">config/initializers/new_framework_defaults_6_0.rb</a>
(45)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-16">config/initializers/wrap_parameters.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-17">config/puma.rb</a>
(10)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-18">db/migrate/20190820192641_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb</a>
(8)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-19">db/structure.sql</a>
(5)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-20">lib/redactable.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-21">test/controllers/api/notes_controller_test.rb</a>
(90)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-22">test/controllers/api/traces_controller_test.rb</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-23">test/controllers/api/user_preferences_controller_test.rb</a>
(14)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-24">test/controllers/api/users_controller_test.rb</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-25">test/controllers/changeset_comments_controller_test.rb</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-26">test/controllers/changesets_controller_test.rb</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-27">test/controllers/traces_controller_test.rb</a>
(10)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/2423/files#diff-28">test/integration/cors_test.rb</a>
(4)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/2423.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/2423.patch</a></li>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/2423.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/2423.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/2423?email_source=notifications&email_token=AAK2OLMFE7BXLOOKCKJF4GDQSHI2ZA5CNFSM4JJIFHL2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HXAFBNQ">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLI3UGPG6QVACIMQDW3QSHI2ZANCNFSM4JJIFHLQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AAK2OLI3IPGC2W636G4E7ZDQSHI2ZA5CNFSM4JJIFHL2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HXAFBNQ.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/2423?email_source=notifications\u0026email_token=AAK2OLMFE7BXLOOKCKJF4GDQSHI2ZA5CNFSM4JJIFHL2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HXAFBNQ",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/2423?email_source=notifications\u0026email_token=AAK2OLMFE7BXLOOKCKJF4GDQSHI2ZA5CNFSM4JJIFHL2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HXAFBNQ",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>