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

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

diff --git a/app/models/old_way_tag.rb b/app/models/old_way_tag.rb
index 14043546cb38feff5f0406757ffd39ece9452435..90bf704b6af2c1a5be5eb7c4ea4107d488a16a85 100644 (file)
--- a/app/models/old_way_tag.rb
+++ b/app/models/old_way_tag.rb
@@ -12,13 +12,13 @@
 #  way_tags_id_fkey  (way_id => ways.way_id)
 #
 
-class OldWayTag < ActiveRecord::Base
+class OldWayTag < ApplicationRecord
   self.table_name = "way_tags"
   self.primary_keys = "way_id", "version", "k"
 
   belongs_to :old_way, :foreign_key => [:way_id, :version]
 
   validates :old_way, :presence => true, :associated => true
-  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => [:way_id, :version] }
 end