summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2018-11-30 13:46:49 +0100
committerJames Lopez <james@jameslopez.es>2018-11-30 13:46:49 +0100
commite9c3766a3a2634adf94b1a037a792778754d5abe (patch)
tree24f2cdfb05ea11e7daf1112e2dff6bfec8d61383
parent0c375b9b4a86dbdc21bc1abb9587b23940f4cf12 (diff)
downloadgitlab-ce-51101-can-add-an-existing-group-member-into-a-group-project-with-new-permissions-but-permissions-are-not-overridden.tar.gz
-rw-r--r--app/models/member.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/member.rb b/app/models/member.rb
index 4938f74a22f..5ae8d848ab1 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -369,7 +369,7 @@ class Member < ActiveRecord::Base
# Find the user's group member with a highest access level
def highest_group_member
strong_memoize(:highest_group_member) do
- next unless source.ancestor_groups.any?
+ next unless source&.ancestor_groups&.any?
GroupMember.where(source: source.ancestor_groups, user_id: user_id).order(:access_level).last
end