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

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

diff --git a/app/models/old_relation_tag.rb b/app/models/old_relation_tag.rb
index 3b75e1c820cb37a2d0351c840fac70bc9a1bf7bc..d6e6e19c2dfb921a4f4621e22f9d83b08b5f86c1 100644 (file)
--- a/app/models/old_relation_tag.rb
+++ b/app/models/old_relation_tag.rb
@@ -12,13 +12,13 @@
 #  relation_tags_id_fkey  (relation_id => relations.relation_id)
 #
 
-class OldRelationTag < ActiveRecord::Base
+class OldRelationTag < ApplicationRecord
   self.table_name = "relation_tags"
   self.primary_keys = "relation_id", "version", "k"
 
   belongs_to :old_relation, :foreign_key => [:relation_id, :version]
 
   validates :old_relation, :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 => [:relation_id, :version] }
 end