diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-24 21:09:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-24 21:09:14 +0300 |
commit | ca386bfc0cf083e0ccb477995378061fc2a15b66 (patch) | |
tree | f53d4a2f288ba64e9f440080817f14d62965398c /doc/user | |
parent | 61ebd5753018a1f4b6032122f6ea625dc4e4fc8e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/enterprise_user/index.md | 4 | ||||
-rw-r--r-- | doc/user/project/issues/managing_issues.md | 47 | ||||
-rw-r--r-- | doc/user/project/merge_requests/approvals/rules.md | 8 | ||||
-rw-r--r-- | doc/user/project/repository/branches/index.md | 7 | ||||
-rw-r--r-- | doc/user/project/repository/mirror/index.md | 1 |
5 files changed, 54 insertions, 13 deletions
diff --git a/doc/user/enterprise_user/index.md b/doc/user/enterprise_user/index.md index e64a9de1a12..7bb8705ace0 100644 --- a/doc/user/enterprise_user/index.md +++ b/doc/user/enterprise_user/index.md @@ -71,6 +71,9 @@ The custom domain must match the email domain exactly. For example, if your emai certificate. You can also add the certificate and key later. 1. Select **Add Domain**. +NOTE: +A valid certificate is not required for domain verification. You can ignore error messages regarding the certificate if you are not using GitLab Pages. + #### 2. Get a verification code After you create a new domain, the verification code prompts you. Copy the values from GitLab @@ -104,6 +107,7 @@ from the GitLab project. > - Once your domain has been verified, leave the verification record in place. Your domain is periodically reverified, and may be disabled if the record is removed. +> - A valid certificate is not required for domain verification. ### View domains in group diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md index 276cc3bc7a5..c34de0efeda 100644 --- a/doc/user/project/issues/managing_issues.md +++ b/doc/user/project/issues/managing_issues.md @@ -18,6 +18,8 @@ Prerequisites: To edit an issue: +1. On the top bar, select **Main menu > Projects** and find your project. +1. Select **Issues**, then select the title of your issue to view it. 1. To the right of the title, select **Edit title and description** (**{pencil}**). 1. Edit the available fields. 1. Select **Save changes**. @@ -114,7 +116,8 @@ Prerequisites: To move an issue: -1. Go to the issue. +1. On the top bar, select **Main menu > Projects** and find your project. +1. Select **Issues**, then select the title of your issue to view it. 1. On the right sidebar, select **Move issue**. 1. Search for a project to move the issue to. 1. Select **Move**. @@ -125,7 +128,7 @@ To move an issue: > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15991) in GitLab 15.6. -You can move multiple issues at the same time when you’re in a project. +You can move multiple issues at the same time when you're in a project. You can't move tasks or test cases. Prerequisite: @@ -204,10 +207,13 @@ Prerequisites: - You must have at least the Reporter role for the project, be the author of the issue, or be assigned to the issue. -To close an issue, you can do the following: +To close an issue, you can either: -- At the top of the issue, select **Close issue**. - In an [issue board](../issue_board.md), drag an issue card from its list into the **Closed** list. +- From any other page in the GitLab UI: + 1. On the top bar, select **Main menu > Projects** and find your project. + 1. Select **Issues**, then select the title of your issue to view it. + 1. At the top of the issue, select **Close issue**. <!-- Delete when the `moved_mr_sidebar` feature flag is removed --> If you don't see this action at the top of an issue, your project or instance might have @@ -330,6 +336,8 @@ Prerequisites: To change issue type: +1. On the top bar, select **Main menu > Projects** and find your project. +1. Select **Issues**, then select the title of your issue to view it. 1. To the right of the title, select **Edit title and description** (**{pencil}**). 1. Edit the issue and select an issue type from the **Issue type** dropdown list: @@ -348,12 +356,16 @@ Prerequisites: To delete an issue: -1. In an issue, select **Issue actions** (**{ellipsis_v}**). +1. On the top bar, select **Main menu > Projects** and find your project. +1. Select **Issues**, then select the title of your issue to view it. +1. On the top right corner, select **Issue actions** (**{ellipsis_v}**). 1. Select **Delete issue**. Alternatively: -1. In an issue, select **Edit title and description** (**{pencil}**). +1. On the top bar, select **Main menu > Projects** and find your project. +1. Select **Issues**, then select the title of your issue to view it. +1. Select **Edit title and description** (**{pencil}**). 1. Select **Delete issue**. ## Promote an issue to an epic **(PREMIUM)** @@ -366,7 +378,9 @@ You can promote an issue to an [epic](../../group/epics/index.md) in the immedia To promote an issue to an epic: -1. In an issue, select **Issue actions** (**{ellipsis_v}**). +1. On the top bar, select **Main menu > Projects** and find your project. +1. Select **Issues**, then select the title of your issue to view it. +1. On the top right corner, select **Issue actions** (**{ellipsis_v}**). 1. Select **Promote to epic**. Alternatively, you can use the `/promote` [quick action](../quick_actions.md#issues-merge-requests-and-epics). @@ -387,7 +401,8 @@ You can use the `/promote_to_incident` [quick action](../quick_actions.md) to pr To add an issue to an [iteration](../../group/iterations/index.md): -1. Go to the issue. +1. On the top bar, select **Main menu > Projects** and find your project. +1. Select **Issues**, then select the title of your issue to view it. 1. On the right sidebar, in the **Iteration** section, select **Edit**. 1. From the dropdown list, select the iteration to associate this issue with. 1. Select any area outside the dropdown list. @@ -417,6 +432,8 @@ Or: To filter the list of issues: +1. On the top bar, select **Main menu > Projects** and find your project. +1. Select **Issues**. 1. Above the list of issues, select **Search or filter results...**. 1. In the dropdown list that appears, select the attribute you want to filter by. 1. Select or type the operator to use for filtering the attribute. The following operators are @@ -469,7 +486,8 @@ To refer to an issue elsewhere in GitLab, you can use its full URL or a short re To copy the issue reference to your clipboard: -1. Go to the issue. +1. On the top bar, select **Main menu > Projects** and find your project. +1. Select **Issues**, then select the title of your issue to view it. 1. On the right sidebar, next to **Reference**, select **Copy Reference** (**{copy-to-clipboard}**). You can now paste the reference into another description or comment. @@ -492,7 +510,8 @@ For more information about creating comments by sending an email and the necessa To copy the issue's email address: -1. Go to the issue. +1. On the top bar, select **Main menu > Projects** and find your project. +1. Select **Issues**, then select the title of your issue to view it. 1. On the right sidebar, next to **Issue email**, select **Copy Reference** (**{copy-to-clipboard}**). ## Assignee @@ -508,7 +527,8 @@ themselves or another project member assigns them. To change the assignee on an issue: -1. Go to your issue. +1. On the top bar, select **Main menu > Projects** and find your project. +1. Select **Issues**, then select the title of your issue to view it. 1. On the right sidebar, in the **Assignee** section, select **Edit**. 1. From the dropdown list, select the user to add as an assignee. 1. Select any area outside the dropdown list. @@ -548,7 +568,8 @@ Prerequisites: To edit health status of an issue: -1. Go to the issue. +1. On the top bar, select **Main menu > Projects** and find your project. +1. Select **Issues**, then select the title of your issue to view it. 1. On the right sidebar, in the **Health status** section, select **Edit**. 1. From the dropdown list, select the status to add to this issue: @@ -556,7 +577,7 @@ To edit health status of an issue: - Needs attention (amber) - At risk (red) -You can see the issue’s health status in: +You can see the issue's health status in: - Issues list - Epic tree diff --git a/doc/user/project/merge_requests/approvals/rules.md b/doc/user/project/merge_requests/approvals/rules.md index 23cad67b69c..bc5d4353ffc 100644 --- a/doc/user/project/merge_requests/approvals/rules.md +++ b/doc/user/project/merge_requests/approvals/rules.md @@ -217,6 +217,14 @@ on a merge request, you can either add or remove approvers: Administrators can change the [merge request approvals settings](settings.md#prevent-editing-approval-rules-in-merge-requests) to prevent users from overriding approval rules for merge requests. +## Require multiple approvals for a rule + +To create an approval rule which requires more than one approval: + +- When you [create or edit a rule](#edit-an-approval-rule), set **Approvals required** to `2` or more. +- Use the [Merge requests approvals API](../../../../api/merge_request_approvals.md#update-merge-request-level-rule) + to set the `approvals_required` attribute to `2` or more. + ## Configure optional approval rules Merge request approvals can be optional for projects where approvals are diff --git a/doc/user/project/repository/branches/index.md b/doc/user/project/repository/branches/index.md index 05494789b83..6375a562219 100644 --- a/doc/user/project/repository/branches/index.md +++ b/doc/user/project/repository/branches/index.md @@ -62,7 +62,14 @@ GitLab creates a default branch and adds your file to it. ### From an issue +Prerequisites: + +- You must have at least the Developer role in the project. + When viewing an issue, you can create an associated branch directly from that page. +Branches created this way use the +[default pattern for branch names from issues](#configure-default-pattern-for-branch-names-from-issues), +including variables. Prerequisites: diff --git a/doc/user/project/repository/mirror/index.md b/doc/user/project/repository/mirror/index.md index efd143dd205..5b531c85ac9 100644 --- a/doc/user/project/repository/mirror/index.md +++ b/doc/user/project/repository/mirror/index.md @@ -184,6 +184,7 @@ for you to check: - [AWS CodeCommit](https://docs.aws.amazon.com/codecommit/latest/userguide/regions.html#regions-fingerprints) - [Bitbucket](https://support.atlassian.com/bitbucket-cloud/docs/configure-ssh-and-two-step-verification/) +- [Codeberg](https://docs.codeberg.org/security/ssh-fingerprint/) - [GitHub](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/githubs-ssh-key-fingerprints) - [GitLab.com](../../../gitlab_com/index.md#ssh-host-keys-fingerprints) - [Launchpad](https://help.launchpad.net/SSHFingerprints) |