From 7120254aee218529320c061696a2af530494e6aa Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 5 Jan 2024 12:13:40 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/project/changelogs.md | 14 +++++++------- doc/user/project/issue_board.md | 2 +- doc/user/project/labels.md | 2 +- .../approvals/img/group_access_example_01_v16_8.png | Bin 63530 -> 20153 bytes .../approvals/img/group_access_example_02_v16_8.png | Bin 61309 -> 18583 bytes doc/user/project/releases/index.md | 2 +- doc/user/project/repository/mirror/bidirectional.md | 2 +- doc/user/project/settings/import_export.md | 12 ++++++------ 8 files changed, 17 insertions(+), 17 deletions(-) (limited to 'doc/user/project') diff --git a/doc/user/project/changelogs.md b/doc/user/project/changelogs.md index a15bd39f1b7..df6df1653ac 100644 --- a/doc/user/project/changelogs.md +++ b/doc/user/project/changelogs.md @@ -15,7 +15,7 @@ commit author. Changelog formats [can be customized](#customize-the-changelog-ou Each section in the default changelog has a title containing the version number and release date, like this: -````markdown +```markdown ## 1.0.0 (2021-01-05) ### Features (4 changes) @@ -24,7 +24,7 @@ number and release date, like this: - [Feature 2](gitlab-org/gitlab@456abc) ([merge request](gitlab-org/gitlab!456)) - [Feature 3](gitlab-org/gitlab@234abc) by @steve - [Feature 4](gitlab-org/gitlab@456) -```` +``` The date format for sections can be customized, but the rest of the title cannot. When adding new sections, GitLab parses these titles to determine where to place @@ -121,11 +121,11 @@ these variables: `### Features`, `### Bug fixes`, and `### Performance improvements`: ```yaml - --- - categories: - feature: Features - bug: Bug fixes - performance: Performance improvements + --- + categories: + feature: Features + bug: Bug fixes + performance: Performance improvements ``` ### Custom templates diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md index e6fd302e4f0..39353480908 100644 --- a/doc/user/project/issue_board.md +++ b/doc/user/project/issue_board.md @@ -101,7 +101,7 @@ For examples of using issue boards along with [epics](../group/epics/index.md), - [How to use GitLab for Agile portfolio planning and project management](https://about.gitlab.com/blog/2020/11/11/gitlab-for-agile-portfolio-planning-project-management/) blog post (November 2020) - -[Cross-project Agile work management with GitLab](https://www.youtube.com/watch?v=5J0bonGoECs) (15 min, July 2020) + [Cross-project Agile work management with GitLab](https://www.youtube.com/watch?v=5J0bonGoECs) (15 min, July 2020) ### Use cases for a single issue board diff --git a/doc/user/project/labels.md b/doc/user/project/labels.md index 2cc38e6a31c..f064d867e0f 100644 --- a/doc/user/project/labels.md +++ b/doc/user/project/labels.md @@ -14,7 +14,7 @@ you're interested in. Labels are a key part of [issue boards](issue_board.md). With labels you can: - Categorize [epics](../group/epics/index.md), issues, and merge requests using colors and descriptive titles like -`bug`, `feature request`, or `docs`. + `bug`, `feature request`, or `docs`. - Dynamically filter and manage [epics](../group/epics/index.md), issues, and merge requests. - Search lists of issues, merge requests, and epics, as well as issue boards. diff --git a/doc/user/project/merge_requests/approvals/img/group_access_example_01_v16_8.png b/doc/user/project/merge_requests/approvals/img/group_access_example_01_v16_8.png index dc2940f9492..0b5fbf7e075 100644 Binary files a/doc/user/project/merge_requests/approvals/img/group_access_example_01_v16_8.png and b/doc/user/project/merge_requests/approvals/img/group_access_example_01_v16_8.png differ diff --git a/doc/user/project/merge_requests/approvals/img/group_access_example_02_v16_8.png b/doc/user/project/merge_requests/approvals/img/group_access_example_02_v16_8.png index e1305ff845c..49df19f2c46 100644 Binary files a/doc/user/project/merge_requests/approvals/img/group_access_example_02_v16_8.png and b/doc/user/project/merge_requests/approvals/img/group_access_example_02_v16_8.png differ diff --git a/doc/user/project/releases/index.md b/doc/user/project/releases/index.md index 6c31b2ad5d3..1d721d71444 100644 --- a/doc/user/project/releases/index.md +++ b/doc/user/project/releases/index.md @@ -70,7 +70,7 @@ You should create a release as one of the last steps in your CI/CD pipeline. Prerequisites: - You must have at least the Developer role for a project. For more information, read -[Release permissions](#release-permissions). + [Release permissions](#release-permissions). To create a release in the Releases page: diff --git a/doc/user/project/repository/mirror/bidirectional.md b/doc/user/project/repository/mirror/bidirectional.md index d4ab550cb8a..dc789d28a4f 100644 --- a/doc/user/project/repository/mirror/bidirectional.md +++ b/doc/user/project/repository/mirror/bidirectional.md @@ -39,7 +39,7 @@ instance can help reduce race conditions by syncing changes more frequently. Prerequisites: - You have configured the [push](push.md#set-up-a-push-mirror-to-another-gitlab-instance-with-2fa-activated) -and [pull](pull.md#pull-from-a-remote-repository) mirrors in the upstream GitLab instance. + and [pull](pull.md#pull-from-a-remote-repository) mirrors in the upstream GitLab instance. To create the webhook in the downstream instance: diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md index dea50ecc408..f2faa0676b5 100644 --- a/doc/user/project/settings/import_export.md +++ b/doc/user/project/settings/import_export.md @@ -347,7 +347,7 @@ Items that are **not** exported include: ### Preparation - To preserve the member list and their respective permissions on imported groups, review the users in these groups. Make -sure these users exist before importing the desired groups. + sure these users exist before importing the desired groups. - Users must set a public email in the source GitLab instance that matches their confirmed primary email in the destination GitLab instance. Most users receive an email asking them to confirm their email address. ### Enable export for a group @@ -407,11 +407,11 @@ Default [modified](https://gitlab.com/gitlab-org/gitlab/-/issues/251106) from 50 To help avoid abuse, by default, users are rate limited to: -| Request Type | Limit | -| ---------------- | ---------------------------------------- | -| Export | 6 groups per minute | -| Download export | 1 download per group per minute | -| Import | 6 groups per minute | +| Request Type | Limit | +|-----------------|-------| +| Export | 6 groups per minute | +| Download export | 1 download per group per minute | +| Import | 6 groups per minute | ## Related topics -- cgit v1.2.3