diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-07 13:14:30 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-07 13:14:30 +0000 |
| commit | 863e372f0b757a492e3896d374209ba6b3b50cff (patch) | |
| tree | 0f74ffbedcffe544e1bf6c0df1150e67db4074a4 /app/models | |
| parent | df326d061e23a7d5eb2618e542c193d4aef79c1a (diff) | |
| parent | 52e62f718f56852daa541553acf28ec75d8d5ff9 (diff) | |
| download | gitlab-ce-863e372f0b757a492e3896d374209ba6b3b50cff.tar.gz | |
Merge branch '6216-extract-ee-specific-files-lines-for-app-views-admin-groups' into 'master'
[CE] Resolve "Extract EE specific files/lines for app/views/admin/groups"
Closes gitlab-ee#6216
See merge request gitlab-org/gitlab-ce!19275
Diffstat (limited to 'app/models')
| -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") |
