Merged rails-4.1 branch (#14534).

git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 3 insertions, 5 deletions

diff --git a/app/models/group.rb b/app/models/group.rb
index 7b82d1c1f..b9d4d9ef4 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -28,6 +28,7 @@ class Group < Principal
   validates_presence_of :lastname
   validates_uniqueness_of :lastname, :case_sensitive => false
   validates_length_of :lastname, :maximum => 255
+  attr_protected :id
 
   before_destroy :remove_references_before_destroy
 
@@ -81,7 +82,8 @@ class Group < Principal
   def user_removed(user)
     members.each do |member|
       MemberRole.
-        includes(:member).
+        joins(:member).
+        references(:member).
         where("#{Member.table_name}.user_id = ? AND #{MemberRole.table_name}.inherited_from IN (?)", user.id, member.member_role_ids).
         each(&:destroy)
     end
@@ -95,10 +97,6 @@ class Group < Principal
     super(attr_name, *args)
   end
 
-  def self.builtin_id(arg)
-    (arg.anonymous? ? GroupAnonymous : GroupNonMember).instance_id
-  end
-
   def self.anonymous
     GroupAnonymous.load_instance
   end