From: Tom Hughes <tom@compton.nu>
Date: Sat, 7 Oct 2023 10:57:54 +0000 (+0100)
Subject: Drop workaround to force UTF8 form upload in IE8
X-Git-Tag: live~581
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8d7b98a618cd381a0aa1de578b4af9421634c308?hp=f6d1b6cda4a4490b439f8f4b0b6b3034f4fc463e

Drop workaround to force UTF8 form upload in IE8

This has been disabled by default in rails for some time.
---

diff --git a/config/application.rb b/config/application.rb
index 7b492aea0..f440ed206 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -19,10 +19,6 @@ module OpenStreetMap
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W[#{config.root}/lib]
 
-    # Force requests from old versions of IE (<= IE8) to be UTF-8 encoded.
-    # This has defaulted to false since rails 6.0
-    config.action_view.default_enforce_utf8 = true
-
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types
diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index 0c1e65551..c8aaf6409 100644
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -135,7 +135,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
         assert_select "input[name=commit][type=submit][value=Publish]", :count => 1
         assert_select "input[name=commit][type=submit][value=Edit]", :count => 1
         assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
-        assert_select "input", :count => 7
+        assert_select "input", :count => 6
       end
     end
   end
@@ -294,7 +294,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
         assert_select "input[name=commit][type=submit][value=Update]", :count => 1
         assert_select "input[name=commit][type=submit][value=Edit]", :count => 1
         assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
-        assert_select "input", :count => 8
+        assert_select "input", :count => 7
       end
     end