Merge branch 'pull/3472'

diff --cc .rubocop_todo.yml
Simple merge

diff --cc app/models/node.rb
Simple merge

diff --cc app/models/note.rb
Simple merge

diff --cc app/models/old_node.rb
index 979f7cb6b25edcbd8fcf6174071b639c2f9f5980,1324c8139bc933bd05589fadc91ba883c8a3270a..4f5f074abf4b65600db82cc9de719bf736f30494
--- 1/app/models/old_node.rb
--- 2/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@@ -46,10 -46,10 +46,10 @@@ class OldNode < ApplicationRecor
    validate :validate_position
  
    belongs_to :changeset
 -  belongs_to :redaction
 +  belongs_to :redaction, :optional => true
-   belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id"
+   belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id", :inverse_of => :old_nodes
  
-   has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version]
+   has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version], :inverse_of => :old_node
  
    def validate_position
      errors.add(:base, "Node is not in the world") unless in_world?

diff --cc app/models/old_node_tag.rb
index ec48c1c0483d51c251bc9d937b68c8a483eeda28,11a2efd5a4b0749c42cea1f6bc67110eee92f0a2..c710e48f133db67436fbe0b86ff9f94ce4c2a9ea
--- 1/app/models/old_node_tag.rb
--- 2/app/models/old_node_tag.rb
+++ b/app/models/old_node_tag.rb
@@@ -16,9 -16,9 +16,9 @@@ class OldNodeTag < ApplicationRecor
    self.table_name = "node_tags"
    self.primary_keys = "node_id", "version", "k"
  
-   belongs_to :old_node, :foreign_key => [:node_id, :version]
+   belongs_to :old_node, :foreign_key => [:node_id, :version], :inverse_of => :old_tags
  
 -  validates :old_node, :presence => true, :associated => true
 +  validates :old_node, :associated => true
    validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
    validates :k, :uniqueness => { :scope => [:node_id, :version] }
  end

diff --cc app/models/old_relation.rb
index 39d53518d1273ae5ed1a2732cc2940fab41ea4e9,71bd4b73dad7594acf0c6e8fac5f4b77259c7109..7f9a747e64c84ef99aee35d4f7117056a4ca7ce6
--- 1/app/models/old_relation.rb
--- 2/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@@ -31,13 -31,13 +31,13 @@@ class OldRelation < ApplicationRecor
    include Redactable
  
    belongs_to :changeset
 -  belongs_to :redaction
 +  belongs_to :redaction, :optional => true
-   belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id"
+   belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id", :inverse_of => :old_relations
  
-   has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :foreign_key => [:relation_id, :version]
-   has_many :old_tags, :class_name => "OldRelationTag", :foreign_key => [:relation_id, :version]
+   has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :foreign_key => [:relation_id, :version], :inverse_of => :old_relation
+   has_many :old_tags, :class_name => "OldRelationTag", :foreign_key => [:relation_id, :version], :inverse_of => :old_relation
  
 -  validates :changeset, :presence => true, :associated => true
 +  validates :changeset, :associated => true
    validates :timestamp, :presence => true
    validates :visible, :inclusion => [true, false]
  

diff --cc app/models/old_relation_tag.rb
index 124c89ad51d2a8f941d51e1297cb3b88611ce158,1fccdf7a841a52b559df91e4886b91438b4e4732..c3a1838912cbfb65ccd57492e4c60bfb05214c78
--- 1/app/models/old_relation_tag.rb
--- 2/app/models/old_relation_tag.rb
+++ b/app/models/old_relation_tag.rb
@@@ -16,9 -16,9 +16,9 @@@ class OldRelationTag < ApplicationRecor
    self.table_name = "relation_tags"
    self.primary_keys = "relation_id", "version", "k"
  
-   belongs_to :old_relation, :foreign_key => [:relation_id, :version]
+   belongs_to :old_relation, :foreign_key => [:relation_id, :version], :inverse_of => :old_tags
  
 -  validates :old_relation, :presence => true, :associated => true
 +  validates :old_relation, :associated => true
    validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
    validates :k, :uniqueness => { :scope => [:relation_id, :version] }
  end

diff --cc app/models/old_way.rb
index 8052899bf24588fab25a034128c0f510f0b5e035,1f00c46ba6a3fbf8cd279235e873fa5ded52177e..acf88ddcf61bc61fab89f925a40be62f7c48509f
--- 1/app/models/old_way.rb
--- 2/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@@ -31,13 -31,13 +31,13 @@@ class OldWay < ApplicationRecor
    include Redactable
  
    belongs_to :changeset
 -  belongs_to :redaction
 +  belongs_to :redaction, :optional => true
-   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
+   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id", :inverse_of => :old_ways
  
-   has_many :old_nodes, :class_name => "OldWayNode", :foreign_key => [:way_id, :version]
-   has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version]
+   has_many :old_nodes, :class_name => "OldWayNode", :foreign_key => [:way_id, :version], :inverse_of => :old_way
+   has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version], :inverse_of => :old_way
  
 -  validates :changeset, :presence => true, :associated => true
 +  validates :changeset, :associated => true
    validates :timestamp, :presence => true
    validates :visible, :inclusion => [true, false]
  

diff --cc app/models/old_way_tag.rb
index bbfffc2cbbe03ffc008b8e416bec8ab4fc1310ee,e684199bf4f49873c0960629064b7f1390cd6f47..0342cf34485c165d2f2ec8ecfd9466f855c7a257
--- 1/app/models/old_way_tag.rb
--- 2/app/models/old_way_tag.rb
+++ b/app/models/old_way_tag.rb
@@@ -16,9 -16,9 +16,9 @@@ class OldWayTag < ApplicationRecor
    self.table_name = "way_tags"
    self.primary_keys = "way_id", "version", "k"
  
-   belongs_to :old_way, :foreign_key => [:way_id, :version]
+   belongs_to :old_way, :foreign_key => [:way_id, :version], :inverse_of => :old_tags
  
 -  validates :old_way, :presence => true, :associated => true
 +  validates :old_way, :associated => true
    validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
    validates :k, :uniqueness => { :scope => [:way_id, :version] }
  end

diff --cc app/models/relation.rb
Simple merge

diff --cc app/models/way.rb
Simple merge