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

[rails.git] / app / models / old_node.rb

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index cc2327d0883f9b1ef2034d7957c1f62c84057542..fe1a900136466472cb258198c3caa6a0b796fdd4 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -24,7 +24,7 @@
 #  nodes_redaction_id_fkey  (redaction_id => redactions.id)
 #
 
-class OldNode < ActiveRecord::Base
+class OldNode < ApplicationRecord
   include GeoRecord
   include ConsistencyValidations
   include ObjectMetadata
@@ -32,15 +32,15 @@ class OldNode < ActiveRecord::Base
   self.table_name = "nodes"
   self.primary_keys = "node_id", "version"
 
-  # note this needs to be included after the table name changes, or
+  # NOTE: this needs to be included after the table name changes, or
   # the queries generated by Redactable will use the wrong table name.
   include Redactable
 
   validates :changeset, :presence => true, :associated => true
   validates :latitude, :presence => true,
-                       :numericality => { :integer_only => true }
+                       :numericality => { :only_integer => true }
   validates :longitude, :presence => true,
-                        :numericality => { :integer_only => true }
+                        :numericality => { :only_integer => true }
   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]