diff options
| author | Francisco Lopez <fjlopez@gitlab.com> | 2017-11-30 12:52:38 +0100 |
|---|---|---|
| committer | Francisco Lopez <fjlopez@gitlab.com> | 2017-12-01 18:32:12 +0100 |
| commit | 194f7bca9a286942bcd764c836180964e33a1e92 (patch) | |
| tree | dd1612a1188dcc0fc9436d2c19de8227b661cc07 /app/models/group.rb | |
| parent | 58c5b463ff75618a557d067c16f49ef581cda85c (diff) | |
| download | gitlab-ce-194f7bca9a286942bcd764c836180964e33a1e92.tar.gz | |
Comments from code review applied. Also switched forked_from_project and ForkedProjectLinks to ForkNetworkMember
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 76262acf50c..27287f079a4 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -289,6 +289,14 @@ class Group < Namespace "#{parent.full_path}/#{path_was}" end + def group_member(user) + if group_members.loaded? + group_members.find { |gm| gm.user_id == user.id } + else + group_members.find_by(user_id: user) + end + end + private def update_two_factor_requirement |