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

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

diff --git a/app/models/node_tag.rb b/app/models/node_tag.rb
index fa21b1ff6fdd60b2c813e7bd7979ee6b5a140837..18e502439b18499fe505eeaee239a1b2b5d4e5ed 100644 (file)
--- a/app/models/node_tag.rb
+++ b/app/models/node_tag.rb
@@ -13,11 +13,10 @@
 
 class NodeTag < ApplicationRecord
   self.table_name = "current_node_tags"
-  self.primary_keys = "node_id", "k"
 
   belongs_to :node
 
-  validates :node, :presence => true, :associated => true
+  validates :node, :associated => true
   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :node_id }
 end