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

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

diff --git a/app/models/relation_tag.rb b/app/models/relation_tag.rb
index ad9a932661bddc63e75eeb428fe00330c327e47b..500b7d910825338fa3ec452b3b184b45a9b706a6 100644 (file)
--- a/app/models/relation_tag.rb
+++ b/app/models/relation_tag.rb
@@ -13,11 +13,10 @@
 
 class RelationTag < ApplicationRecord
   self.table_name = "current_relation_tags"
-  self.primary_keys = "relation_id", "k"
 
   belongs_to :relation
 
-  validates :relation, :presence => true, :associated => true
+  validates :relation, :associated => true
   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :relation_id }
 end