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

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

diff --git a/app/models/changeset_tag.rb b/app/models/changeset_tag.rb
index 1231fc24f5c2367b9d63a39a84a642b604e79da9..672e6f76ca90c1e6cbdeebeb51d57174e68be239 100644 (file)
--- a/app/models/changeset_tag.rb
+++ b/app/models/changeset_tag.rb
@@ -15,12 +15,12 @@
 #  changeset_tags_id_fkey  (changeset_id => changesets.id)
 #
 
-class ChangesetTag < ActiveRecord::Base
+class ChangesetTag < ApplicationRecord
   self.primary_keys = "changeset_id", "k"
 
   belongs_to :changeset
 
-  validates :changeset, :presence => true, :associated => true
-  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true
+  validates :changeset, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :changeset_id }
 end