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

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

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index 2de551c3f437c2b420574ca84aa58e17f9421bf3..2b72cd2b182595bd6f6abb2d138559c700572103 100644 (file)
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -19,8 +19,9 @@
 
 class RelationMember < ApplicationRecord
   self.table_name = "current_relation_members"
-  self.primary_keys = "relation_id", "sequence_id"
 
   belongs_to :relation
   belongs_to :member, :polymorphic => true
+
+  validates :member_role, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
 end