diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-31 14:26:47 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-31 14:40:17 +0200 |
| commit | 75b268bf81b8606154fa8475eb40b7bdfb87638f (patch) | |
| tree | b704fd94f84a386b95d9234ae1f37bdd2ec91b4a | |
| parent | c77e1d410f353fdf9662a3e4de97fcb0c6ab9220 (diff) | |
| download | gitlab-ce-6216-extract-ee-specific-files-lines-for-app-views-admin-groups.tar.gz | |
Reduce CE/EE diff in app/views/admin/groups/show.html.haml6216-extract-ee-specific-files-lines-for-app-views-admin-groups
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | app/models/group.rb | 4 | ||||
| -rw-r--r-- | app/views/admin/groups/show.html.haml | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 8fb77a7869d..babf03b99d2 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -195,6 +195,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") diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 6d75ccd5add..8797687465e 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -40,6 +40,8 @@ %strong = @group.created_at.to_s(:medium) + = render_if_exists 'admin/namespace_plan_info', namespace: @group + %li %span.light Storage: %strong= storage_counter(@group.storage_size) @@ -58,6 +60,10 @@ = group_lfs_status(@group) = link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs') + = render_if_exists 'namespaces/shared_runner_status', namespace: @group + + = render_if_exists 'ldap_group_links/ldap_group_links', group: @group + .card .card-header %h3.card-title @@ -104,7 +110,7 @@ = form_tag admin_group_members_update_path(@group), id: "new_project_member", class: "bulk_import", method: :put do %div - = users_select_tag(:user_ids, multiple: true, email_user: true, scope: :all) + = users_select_tag(:user_ids, multiple: true, email_user: true, skip_ldap: @group.ldap_synced?, scope: :all) .prepend-top-10 = select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2" %hr |