<p>This updates the site to use rails 4.2 (currently 4.2.0).</p>
<p>A test site is up at <a href="http://rails42.apis.dev.openstreetmap.org/">http://rails42.apis.dev.openstreetmap.org/</a> and things could probably do with a bit of testing before we merge this.</p>
<hr>
<h4>You can merge this Pull Request by running</h4>
<pre> git pull https://github.com/tomhughes/openstreetmap-website rails42</pre>
<p>Or view, comment on, or merge it at:</p>
<p> <a href='https://github.com/openstreetmap/openstreetmap-website/pull/868'>https://github.com/openstreetmap/openstreetmap-website/pull/868</a></p>
<h4>Commit Summary</h4>
<ul>
<li>Update to rails 4.2.0</li>
<li>Cleanup migrations</li>
<li>Replace deprecated deliver method with deliver_now</li>
<li>Replace deprecated reset method with restore method</li>
<li>Updated for changes in rails HTML testing</li>
<li>Set default formats in the database now that rails handles enums</li>
<li>Don't try and match xmlns as an attribute</li>
<li>Remove some (hopefully) redundant code</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-0">Gemfile</a>
(10)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-1">Gemfile.lock</a>
(128)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-2">Rakefile</a>
(1)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-3">app/controllers/changeset_controller.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-4">app/controllers/diary_entry_controller.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-5">app/controllers/message_controller.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-6">app/controllers/notes_controller.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-7">app/controllers/user_controller.rb</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-8">app/models/diary_comment.rb</a>
(5)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-9">app/models/diary_entry.rb</a>
(5)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-10">app/models/message.rb</a>
(8)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-11">app/models/old_node.rb</a>
(5)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-12">app/models/old_relation.rb</a>
(7)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-13">app/models/old_way.rb</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-14">app/models/redaction.rb</a>
(10)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-15">app/models/user.rb</a>
(1)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-16">app/models/user_block.rb</a>
(8)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-17">config.ru</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-18">config/application.rb</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-19">config/boot.rb</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-20">config/environments/development.rb</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-21">config/environments/production.rb</a>
(31)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-22">config/environments/test.rb</a>
(7)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-23">config/initializers/assets.rb</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-24">config/initializers/cookies_serializer.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-25">config/initializers/mime_types.rb</a>
(1)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-26">config/initializers/postgresql_adapter.rb</a>
(34)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-27">db/migrate/001_create_osm_db.rb</a>
(192)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-28">db/migrate/002_cleanup_osm_db.rb</a>
(123)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-29">db/migrate/003_sql_session_store_setup.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-30">db/migrate/004_user_enhancements.rb</a>
(26)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-31">db/migrate/005_tile_tracepoints.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-32">db/migrate/006_tile_nodes.rb</a>
(72)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-33">db/migrate/007_add_relations.rb</a>
(49)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-34">db/migrate/008_remove_segments.rb</a>
(18)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-35">db/migrate/010_diary_comments.rb</a>
(14)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-36">db/migrate/018_create_acls.rb</a>
(10)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-37">db/migrate/020_populate_node_tags_and_remove.rb</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-38">db/migrate/021_move_to_innodb.rb</a>
(8)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-39">db/migrate/022_key_constraints.rb</a>
(22)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-40">db/migrate/023_add_changesets.rb</a>
(24)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-41">db/migrate/025_add_end_time_to_changesets.rb</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-42">db/migrate/028_add_more_changeset_indexes.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-43">db/migrate/029_add_user_foreign_keys.rb</a>
(26)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-44">db/migrate/030_add_foreign_keys.rb</a>
(8)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-45">db/migrate/031_create_countries.rb</a>
(14)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-46">db/migrate/034_create_languages.rb</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-47">db/migrate/035_change_user_locale.rb</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-48">db/migrate/042_add_foreign_keys_to_oauth_tables.rb</a>
(14)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-49">db/migrate/044_create_user_roles.rb</a>
(7)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-50">db/migrate/045_create_user_blocks.rb</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-51">db/migrate/046_alter_user_roles_and_blocks.rb</a>
(8)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-52">db/migrate/054_refactor_map_bug_tables.rb</a>
(8)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-53">db/migrate/20110521142405_rename_bugs_to_notes.rb</a>
(20)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-54">db/migrate/20111212183945_add_lowercase_user_indexes.rb</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-55">db/migrate/20120318201948_create_redactions.rb</a>
(13)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-56">db/migrate/20120328090602_drop_session_table.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-57">db/migrate/20120404205604_add_user_and_description_to_redaction.rb</a>
(11)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-58">db/migrate/20140115192822_add_text_index_to_note_comments.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-59">db/migrate/20140507110937_create_changeset_comments.rb</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-60">db/migrate/20140519141742_add_join_table_between_users_and_changesets.rb</a>
(4)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-61">db/migrate/20150110152606_change_default_formats.rb</a>
(17)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-62">db/structure.sql</a>
(122)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-63">lib/migrate.rb</a>
(146)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-64">test/controllers/api_controller_test.rb</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-65">test/controllers/diary_entry_controller_test.rb</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/868/files#diff-66">test/lib/rich_text_test.rb</a>
(6)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/868.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/868.patch</a></li>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/868.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/868.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/868">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABWnLcJokMvWswdmAZcKb6y18GXHRqsVks5ngneCgaJpZM4DQ4X7.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/868"></link>
<meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>