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

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

diff --git a/app/models/changeset_tag.rb b/app/models/changeset_tag.rb
index 1231fc24f5c2367b9d63a39a84a642b604e79da9..da9fbce51a4732833cd86f0349caf1aab5a2e530 100644 (file)
--- a/app/models/changeset_tag.rb
+++ b/app/models/changeset_tag.rb
@@ -6,21 +6,15 @@
 #  k            :string           default(""), not null, primary key
 #  v            :string           default(""), not null
 #
-# Indexes
-#
-#  changeset_tags_id_idx  (changeset_id)
-#
 # Foreign Keys
 #
 #  changeset_tags_id_fkey  (changeset_id => changesets.id)
 #
 
-class ChangesetTag < ActiveRecord::Base
-  self.primary_keys = "changeset_id", "k"
-
+class ChangesetTag < ApplicationRecord
   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