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

openstreetmap · Mar 28, 2024 · 50df5ee · 50df5ee
2 parents df4349a + 16cc2e7
commit 50df5ee
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,