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

[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 801ca7cab48cf48ee6513d5b856c449c82086b65..4a247949c48c90d298e84c4c9e6034ddaf5e4bb3 100644 (file)
--- a/app/models/old_relation_tag.rb
+++ b/app/models/old_relation_tag.rb
@@ -19,6 +19,6 @@ class OldRelationTag < ActiveRecord::Base
   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