diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-27 18:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-27 18:09:34 +0300 |
| commit | f459f810d53dd453d3fc39df2dd62f01629d99e4 (patch) | |
| tree | 1ecd155b532808014da10d0c04357292f06700a9 /doc/administration | |
| parent | 71329edee6b7c2af838e07189dfeef8a41cd66ec (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/instance_limits.md | 9 | ||||
| -rw-r--r-- | doc/administration/packages/container_registry.md | 2 | ||||
| -rw-r--r-- | doc/administration/settings/usage_statistics.md | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md index 12ba3623f3e..d5855e3c832 100644 --- a/doc/administration/instance_limits.md +++ b/doc/administration/instance_limits.md @@ -992,18 +992,19 @@ Set the limit to `0` to disable it. ## Math rendering limits -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132939) in GitLab 16.5. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132939) in GitLab 16.5. +> - [Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/368009) the 50-node limit from Wiki and repository files. GitLab imposes default limits when rendering math in Markdown fields. These limits provide better security and performance. -The limits for issues, merge requests, wikis, and repositories: +The limits for issues, merge requests, epics, wikis, and repository files: -- Maximum number of nodes rendered: `50`. - Maximum number of macro expansions: `1000`. - Maximum user-specified size in [em](https://en.wikipedia.org/wiki/Em_(typography)): `20`. -The limits for issues and merge requests: +The limits for issues, merge requests, and epics: +- Maximum number of nodes rendered: `50`. - Maximum number of characters in a math block: `1000`. - Maximum rendering time: `2000 ms`. diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md index dcc6b768eed..10ea8d64e4a 100644 --- a/doc/administration/packages/container_registry.md +++ b/doc/administration/packages/container_registry.md @@ -1028,7 +1028,7 @@ projects.each do |p| end if project_total_size > 0 - projects_and_size << [p.project_id, p.creator.id, project_total_size, p.full_path] + projects_and_size << [p.project_id, p.creator&.id, project_total_size, p.full_path] end end diff --git a/doc/administration/settings/usage_statistics.md b/doc/administration/settings/usage_statistics.md index 7c6a5dd7fa0..93c967e4b54 100644 --- a/doc/administration/settings/usage_statistics.md +++ b/doc/administration/settings/usage_statistics.md @@ -68,6 +68,7 @@ In the following table, you can see: | [Group webhooks](../../user/project/integrations/webhooks.md#group-webhooks) | GitLab 16.6 and later | | [Service Level Agreement countdown timer](../../operations/incident_management/incidents.md#service-level-agreement-countdown-timer) | GitLab 16.6 and later | | [Lock project membership to group](../../user/group/access_and_permissions.md#prevent-members-from-being-added-to-projects-in-a-group) | GitLab 16.6 and later | +| [Users and permissions report](../../administration/admin_area.md#user-permission-export) | GitLab 16.6 and later | ### Enable registration features |