diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 12:09:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 12:09:43 +0300 |
commit | f5050253469fc0961c02deec0e698ad62bdd9de5 (patch) | |
tree | 30bbd8f8b556fd5b730f0123921138ee1d6bdaa2 /app/views/admin | |
parent | f6cdec670b9b757fc2225a2c6627ab79765e5b8a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
-rw-r--r-- | app/views/admin/application_settings/_registry.html.haml | 9 | ||||
-rw-r--r-- | app/views/admin/dashboard/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/dashboard/stats.html.haml | 75 |
3 files changed, 85 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_registry.html.haml b/app/views/admin/application_settings/_registry.html.haml index 77623e1495b..0631c024eb8 100644 --- a/app/views/admin/application_settings/_registry.html.haml +++ b/app/views/admin/application_settings/_registry.html.haml @@ -5,5 +5,14 @@ .form-group = f.label :container_registry_token_expire_delay, 'Authorization token duration (minutes)', class: 'label-bold' = f.number_field :container_registry_token_expire_delay, class: 'form-control' + .form-group + .form-check + = f.check_box :container_expiration_policies_enable_historic_entries, class: 'form-check-input' + = f.label :container_expiration_policies_enable_historic_entries, class: 'form-check-label' do + = _("Enable container expiration and retention policies for projects created earlier than GitLab 12.7.") + = link_to icon('question-circle'), help_page_path('user/packages/container_registry/index', anchor: 'expiration-policy') + .form-text.text-muted + = _("Existing projects will be able to use expiration policies. Avoid enabling this if an external Container Registry is being used, as there is a performance risk if many images exist on one project.") + = link_to icon('question-circle'), help_page_path('user/packages/container_registry/index', anchor: 'use-with-external-container-registries') = f.submit 'Save changes', class: "btn btn-success" diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 68f761c75d8..951e5364ad8 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -30,7 +30,7 @@ %hr .btn-group.d-flex{ role: 'group' } = link_to 'New user', new_admin_user_path, class: "btn btn-success" - = render_if_exists 'admin/dashboard/users_statistics' + = link_to s_('AdminArea|Users statistics'), admin_dashboard_stats_path, class: 'btn btn-primary' .col-sm-4 .info-well.dark-well .well-segment.well-centered diff --git a/app/views/admin/dashboard/stats.html.haml b/app/views/admin/dashboard/stats.html.haml new file mode 100644 index 00000000000..f7f2c717308 --- /dev/null +++ b/app/views/admin/dashboard/stats.html.haml @@ -0,0 +1,75 @@ +- page_title s_('AdminArea|Users statistics') + +%h3.my-4 + = s_('AdminArea|Users statistics') +%table.table.gl-text-gray-700 + %tr + %td.p-3 + = s_('AdminArea|Users without a Group and Project') + = render_if_exists 'admin/dashboard/included_free_in_license_tooltip' + %td.p-3.text-right + = @users_statistics&.without_groups_and_projects.to_i + %tr + %td.p-3 + = s_('AdminArea|Users with highest role') + %strong + = s_('AdminArea|Guest') + = render_if_exists 'admin/dashboard/included_free_in_license_tooltip' + %td.p-3.text-right + = @users_statistics&.with_highest_role_guest.to_i + %tr + %td.p-3 + = s_('AdminArea|Users with highest role') + %strong + = s_('AdminArea|Reporter') + %td.p-3.text-right + = @users_statistics&.with_highest_role_reporter.to_i + %tr + %td.p-3 + = s_('AdminArea|Users with highest role') + %strong + = s_('AdminArea|Developer') + %td.p-3.text-right + = @users_statistics&.with_highest_role_developer.to_i + %tr + %td.p-3 + = s_('AdminArea|Users with highest role') + %strong + = s_('AdminArea|Maintainer') + %td.p-3.text-right + = @users_statistics&.with_highest_role_maintainer.to_i + %tr + %td.p-3 + = s_('AdminArea|Users with highest role') + %strong + = s_('AdminArea|Owner') + %td.p-3.text-right + = @users_statistics&.with_highest_role_owner.to_i + %tr + %td.p-3 + = s_('AdminArea|Bots') + %td.p-3.text-right + = @users_statistics&.bots.to_i + + %tr.bg-gray-light.gl-text-gray-900 + %td.p-3 + %strong + = s_('AdminArea|Active users') + = render_if_exists 'admin/dashboard/billable_users_text' + %td.p-3.text-right + %strong + = @users_statistics&.active.to_i + %tr.bg-gray-light.gl-text-gray-900 + %td.p-3 + %strong + = s_('AdminArea|Blocked users') + %td.p-3.text-right + %strong + = @users_statistics&.blocked.to_i + %tr.bg-gray-light.gl-text-gray-900 + %td.p-3 + %strong + = s_('AdminArea|Total users') + %td.p-3.text-right + %strong + = @users_statistics&.total.to_i |