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

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

diff --git a/app/models/changeset_tag.rb b/app/models/changeset_tag.rb
index 8d6cd45ac3bb1056aa72f8643b4dfd7c8c37ffe1..751029e03995c60835dc1d7eb0ab79a21fb48b3e 100644 (file)
--- a/app/models/changeset_tag.rb
+++ b/app/models/changeset_tag.rb
@@ -2,7 +2,7 @@
 #
 # Table name: changeset_tags
 #
-#  changeset_id :integer          not null, primary key
+#  changeset_id :bigint(8)        not null, primary key
 #  k            :string           default(""), not null, primary key
 #  v            :string           default(""), not null
 #
@@ -21,6 +21,6 @@ class ChangesetTag < ActiveRecord::Base
   belongs_to :changeset
 
   validates :changeset, :presence => true, :associated => true
-  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :changeset_id }
 end