diff options
author | Rémy Coutable <remy@rymai.me> | 2018-05-31 14:00:36 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-06 17:40:49 +0200 |
commit | 52e62f718f56852daa541553acf28ec75d8d5ff9 (patch) | |
tree | 979e15bd34861349416dfc962cba8c9c46a6614a /app/models/group.rb | |
parent | 6c5c383361f0e1cd8cfb9ca671a58abcdf4a6c0b (diff) | |
download | gitlab-ce-52e62f718f56852daa541553acf28ec75d8d5ff9.tar.gz |
Reduce CE/EE diff in app/views/admin/groups/
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/group.rb')
-rw-r--r-- | app/models/group.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 8fb77a7869d..aeb50fb9bb7 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -141,13 +141,14 @@ class Group < Namespace ) end - def add_user(user, access_level, current_user: nil, expires_at: nil) + def add_user(user, access_level, current_user: nil, expires_at: nil, ldap: false) GroupMember.add_user( self, user, access_level, current_user: current_user, - expires_at: expires_at + expires_at: expires_at, + ldap: ldap ) end @@ -195,6 +196,10 @@ class Group < Namespace owners.include?(user) && owners.size == 1 end + def ldap_synced? + false + end + def post_create_hook Gitlab::AppLogger.info("Group \"#{name}\" was created") |