Add latest changes from gitlab-org/gitlab@master

5 files changed, 12 insertions, 8 deletions

diff --git a/doc/user/application_security/container_scanning/index.md b/doc/user/application_security/container_scanning/index.md
index 1d7799a35cc..143d7ff3dad 100644
--- a/doc/user/application_security/container_scanning/index.md
+++ b/doc/user/application_security/container_scanning/index.md
@@ -669,7 +669,10 @@ mirror trivy java db:
     - oras push $CI_REGISTRY_IMAGE:1 --config /dev/null:application/vnd.aquasec.trivy.config.v1+json javadb.tar.gz:application/vnd.aquasec.trivy.javadb.layer.v1.tar+gzip
 ```
 
-If the above container registry is `gitlab.example.com/trivy-java-db-mirror`, then the container scanning job should be configured in the following way:
+The vulnerability database is not a regular Docker image, so it is not possible to pull it by using `docker pull`.
+The image shows an error if you navigate to it in the GitLab UI.
+
+If the above container registry is `gitlab.example.com/trivy-java-db-mirror`, then the container scanning job should be configured in the following way. Do not add the tag `:1` at the end, it is added by `trivy`:
 
 ```yaml
 include:
@@ -677,7 +680,7 @@ include:
 
 container_scanning:
   variables:
-    CS_TRIVY_JAVA_DB: gitlab.example.com/trivy-java-db-mirror:1
+    CS_TRIVY_JAVA_DB: gitlab.example.com/trivy-java-db-mirror
 ```
 
 ## Running the standalone container scanning tool
diff --git a/doc/user/group/import/index.md b/doc/user/group/import/index.md
index 4c565aa0c32..694b84c45a6 100644
--- a/doc/user/group/import/index.md
+++ b/doc/user/group/import/index.md
@@ -113,6 +113,8 @@ If you are migrating large projects and encounter problems with timeouts or dura
 
 ### Limits
 
+> Eight hour time limit on migrations [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/429867) in GitLab 16.7.
+
 Hardcoded limits apply on migration by direct transfer.
 
 | Limit       | Description                                                                                                                                                                     |
@@ -121,7 +123,6 @@ Hardcoded limits apply on migration by direct transfer.
 | 210 seconds | Maximum number of seconds to wait for decompressing an archive file.                                                                                                            |
 | 50 MB       | Maximum length an NDJSON row can have.                                                                                                                                          |
 | 5 minutes   | Maximum number of seconds until an empty export status on source instance is raised.                                                                                            |
-| 8 hours     | Time until migration times out.                                                                                                                                                 |
 
 [Configurable limits](../../../administration/settings/account_and_limit_settings.md) are also available.
 
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index bb808065d33..82a254c090a 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -114,7 +114,7 @@ To edit group details:
 1. Select **Settings > General**.
 1. In the **Group name** text box, enter your group name. See the [limitations on group names](../../user/reserved_names.md).
 1. Optional. In the **Group description (optional)** text box, enter your group description.
-   The description is limited to 250 characters.
+   The description is limited to 500 characters.
 1. Select **Save changes**.
 
 ## Remove a group
diff --git a/doc/user/project/index.md b/doc/user/project/index.md
index 8601e7f7eef..e770940503c 100644
--- a/doc/user/project/index.md
+++ b/doc/user/project/index.md
@@ -52,7 +52,7 @@ To create a project from a built-in template:
    - In the **Project slug** field, enter the path to your project. The GitLab instance uses the
      slug as the URL path to the project. To change the slug, first enter the project name,
      then change the slug.
-   - In the **Project description (optional)** field, enter the description of your project's dashboard. The description is limited to 250 characters.
+   - In the **Project description (optional)** field, enter the description of your project's dashboard. The description is limited to 500 characters.
    - To modify the project's [viewing and access rights](../public_access.md) for users,
      change the **Visibility Level**.
 1. Select **Create project**.
@@ -82,7 +82,7 @@ Custom project templates are available at:
    - In the **Project slug** field, enter the path to your project. The GitLab instance uses the
      slug as the URL path to the project. To change the slug, first enter the project name,
      then change the slug.
-   - The description of your project's dashboard in the **Project description (optional)** field. The description is limited to 250 characters.
+   - The description of your project's dashboard in the **Project description (optional)** field. The description is limited to 500 characters.
    - To modify the project's [viewing and access rights](../public_access.md) for users,
      change the **Visibility Level**.
 1. Select **Create project**.
@@ -107,7 +107,7 @@ To create a project from the HIPAA Audit Protocol template:
    - In the **Project slug** field, enter the path to your project. The GitLab instance uses the
      slug as the URL path to the project. To change the slug, first enter the project name,
      then change the slug.
-   - In the **Project description (optional)** field, enter the description of your project's dashboard. The description is limited to 250 characters.
+   - In the **Project description (optional)** field, enter the description of your project's dashboard. The description is limited to 500 characters.
    - To modify the project's [viewing and access rights](../public_access.md) for users,
      change the **Visibility Level**.
 1. Select **Create project**.
diff --git a/doc/user/project/working_with_projects.md b/doc/user/project/working_with_projects.md
index a7109184945..e007c3fadeb 100644
--- a/doc/user/project/working_with_projects.md
+++ b/doc/user/project/working_with_projects.md
@@ -61,7 +61,7 @@ Prerequisites:
 1. On the left sidebar, select **Search or go to** and find your project.
 1. Select **Settings > General**.
 1. In the **Project name** text box, enter your project name. See the [limitations on project names](../../user/reserved_names.md).
-1. In the **Project description** text box, enter your project description. The description is limited to 250 characters.
+1. In the **Project description** text box, enter your project description. The description is limited to 500 characters.
 1. Under **Project avatar**, to change your project avatar, select **Choose file**.
 
 ## Star a project