From 2d1866d966d94c688f9cb87c5bf3f096dffac844 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 22 Oct 2014 17:37:16 +0000
Subject: Merged rails-4.1 branch (#14534).

git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/member_role.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/models/member_role.rb')

diff --git a/app/models/member_role.rb b/app/models/member_role.rb
index 74d4c631f..038509026 100644
--- a/app/models/member_role.rb
+++ b/app/models/member_role.rb
@@ -26,6 +26,7 @@ class MemberRole < ActiveRecord::Base
 
   validates_presence_of :role
   validate :validate_role_member
+  attr_protected :id
 
   def validate_role_member
     errors.add :role_id, :invalid if role && !role.member?
-- 
cgit v1.2.3