From: Tom Hughes <tom@compton.nu>
Date: Thu, 28 Mar 2024 17:11:58 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4632'
X-Git-Tag: live~171
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/50df5eefcc5c45a47e1fcac50fe3ad6af6245819?hp=df4349a0505fd0acc6dab814efba9113af24dba5

Merge remote-tracking branch 'upstream/pull/4632'
---

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index 812db6016..3ea5fb64e 100644
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -15,9 +15,6 @@ class ChangesetsController < ApplicationController
 
   around_action :web_timeout
 
-  # Helper methods for checking consistency
-  include ConsistencyValidations
-
   ##
   # list non-empty changesets in reverse chronological order
   def index
diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 3ec5cd415..b323f0b4f 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -26,7 +26,6 @@
 
 class OldNode < ApplicationRecord
   include GeoRecord
-  include ConsistencyValidations
 
   self.table_name = "nodes"
 
diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 5ff12fd58..7d5a3fbb4 100644
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -21,8 +21,6 @@
 #
 
 class OldRelation < ApplicationRecord
-  include ConsistencyValidations
-
   self.table_name = "relations"
 
   # NOTE: this needs to be included after the table name changes, or
diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index a55d3ed00..8577330c5 100644
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -21,8 +21,6 @@
 #
 
 class OldWay < ApplicationRecord
-  include ConsistencyValidations
-
   self.table_name = "ways"
 
   # NOTE: this needs to be included after the table name changes, or
diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index d1987a936..2784646af 100644
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -4,8 +4,6 @@
 # Uses the streaming LibXML "Reader" interface to cut down on memory
 # usage, so hopefully we can process fairly large diffs.
 class DiffReader
-  include ConsistencyValidations
-
   # maps each element type to the model class which handles it
   MODELS = {
     "node" => Node,