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

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index 812db6016347de3ae472e11e7e0173d615e116ce..3ea5fb64e96288551aac8169b5dfaaecc5630087 100644 (file)
--- 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 3ec5cd4152939a24bf1816045dfe66bc23b4a262..b323f0b4f0eb65bef77b0750008d6a3d95d326cf 100644 (file)
--- 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 5ff12fd586bfb742d2f523bacbf6602df384cec9..7d5a3fbb4096e3c8e077a9595d8ec067ef969638 100644 (file)
--- 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 a55d3ed004a72bc678b959022e60ac33661ec199..8577330c52823dd808e5128b7047f7a17dcd9c5a 100644 (file)
--- 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 d1987a93622f0d1a44eb128555f6f6cc4258bd26..2784646afecbcf6fbcca3c02141bbd6671a3b75f 100644 (file)
--- 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,