diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-28 06:15:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-28 06:15:57 +0300 |
commit | c5f4c801a6b40e7ee4b96aba20bbec687ccf0502 (patch) | |
tree | ad58e3d5ca9b38d0e86a78143f12362bb35ea1be /doc/user | |
parent | 3235221bc498ca3c80eeca505fb32bf9f237778a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/application_security/dast_api/index.md | 3 | ||||
-rw-r--r-- | doc/user/group/settings/group_access_tokens.md | 7 | ||||
-rw-r--r-- | doc/user/profile/account/delete_account.md | 2 | ||||
-rw-r--r-- | doc/user/project/description_templates.md | 42 | ||||
-rw-r--r-- | doc/user/project/settings/project_access_tokens.md | 5 |
5 files changed, 45 insertions, 14 deletions
diff --git a/doc/user/application_security/dast_api/index.md b/doc/user/application_security/dast_api/index.md index f1eba505589..60db289f9a0 100644 --- a/doc/user/application_security/dast_api/index.md +++ b/doc/user/application_security/dast_api/index.md @@ -478,6 +478,9 @@ Follow these steps to provide the bearer token with `DAST_API_OVERRIDES_ENV`: `{"headers":{"Authorization":"Bearer dXNlcm5hbWU6cGFzc3dvcmQ="}}` (substitute your token). You can create CI/CD variables from the GitLab projects page at **Settings > CI/CD**, in the **Variables** section. + Due to the format of `TEST_API_BEARERAUTH` it's not possible to mask the variable. + To mask the token's value, you can create a second variable with the token value's, and define + `TEST_API_BEARERAUTH` with the value `{"headers":{"Authorization":"Bearer $MASKED_VARIABLE"}}`. 1. In your `.gitlab-ci.yml` file, set `DAST_API_OVERRIDES_ENV` to the variable you just created: diff --git a/doc/user/group/settings/group_access_tokens.md b/doc/user/group/settings/group_access_tokens.md index d15e360cf09..769943cd5d8 100644 --- a/doc/user/group/settings/group_access_tokens.md +++ b/doc/user/group/settings/group_access_tokens.md @@ -143,5 +143,8 @@ Even when creation is disabled, you can still use and revoke existing group acce ## Bot users for groups Each time you create a group access token, a bot user is created and added to the group. -These bot users are similar to [bot users for projects](../../project/settings/project_access_tokens.md#bot-users-for-projects), but are added to groups instead of projects. For more information, see -[Bot users for projects](../../project/settings/project_access_tokens.md#bot-users-for-projects). +These bot users are similar to [bot users for projects](../../project/settings/project_access_tokens.md#bot-users-for-projects), +except they are added to groups instead of projects. +These bot users do not count as licensed seats. + +For more information, see [Bot users for projects](../../project/settings/project_access_tokens.md#bot-users-for-projects). diff --git a/doc/user/profile/account/delete_account.md b/doc/user/profile/account/delete_account.md index 1a938574c9f..c116b1fc00d 100644 --- a/doc/user/profile/account/delete_account.md +++ b/doc/user/profile/account/delete_account.md @@ -65,7 +65,7 @@ Here's a list of things created by the user that are **not** deleted: - Notes Instead of being deleted, these records are moved to a system-wide -user with the username "Ghost User", whose sole purpose is to act as a container +user with the username Ghost User, whose sole purpose is to act as a container for such records. Any commits made by a deleted user still display the username of the original user. diff --git a/doc/user/project/description_templates.md b/doc/user/project/description_templates.md index 6c17964f3a5..539f5230063 100644 --- a/doc/user/project/description_templates.md +++ b/doc/user/project/description_templates.md @@ -114,7 +114,9 @@ To re-use templates [you've created](../project/description_templates.md#create- You might also be interested in templates for various [file types in groups](../group/index.md#group-file-templates). -### Set a default template for merge requests and issues **(PREMIUM)** +### Set a default template for merge requests and issues + +> `Default.md` template [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78302) in GitLab 14.8. In a project, you can choose a default description template for new issues and merge requests. As a result, every time a new merge request or issue is created, it's pre-filled with the text you @@ -125,17 +127,29 @@ Prerequisites: - On your project's left sidebar, select **Settings > General** and expand **Visibility, project features, permissions**. Ensure issues or merge requests are set to either **Everyone with access** or **Only Project Members**. -To set a default description template for merge requests: +To set a default description template for merge requests, either: -1. Go to your project's **Settings**. -1. Select **Expand** under the **Merge requests** header. -1. Fill in the **Default description template for merge requests** text area. -1. Select **Save changes**. +- [Create a merge request template](#create-a-merge-request-template) named `Default.md` and save it in `.gitlab/merge_request_templates/`. + This will not overwrite the default template if one has been set in the project settings. +- Users on GitLab Premium and higher: set the default template in project settings: + + 1. On the top bar, select **Menu > Projects** and find your project. + 1. On the left sidebar, select **Settings**. + 1. Expand **Merge requests**. + 1. Fill in the **Default description template for merge requests** text area. + 1. Select **Save changes**. + +To set a default description template for issues, either: -To set a default description template for issues: +- [Create an issue template](#create-an-issue-template) named `Default.md` and save it in `.gitlab/issue_templates/`. + This will not overwrite the default template if one has been set in the project settings. +- Users on GitLab Premium and higher: set the default template in project settings: -1. Select **Expand** under **Default issue template**. -1. Fill in the **Default description template for issues** text area. + 1. On the top bar, select **Menu > Projects** and find your project. + 1. On the left sidebar, select **Settings**. + 1. Expand **Default issue template**. + 1. Fill in the **Default description template for issues** text area. + 1. Select **Save changes**. Because GitLab merge request and issues support [Markdown](../markdown.md), you can use it to format headings, lists, and so on. @@ -143,6 +157,16 @@ headings, lists, and so on. You can also provide `issues_template` and `merge_requests_template` attributes in the [Projects REST API](../../api/projects.md) to keep your default issue and merge request templates up to date. +#### Priority of description templates + +When you set [merge request and issue description templates](#set-a-default-template-for-merge-requests-and-issues) +in various places, they have the following priorities in a project. +The ones higher up override the ones below: + +1. Template selected in project settings. +1. `Default.md` from the parent group. +1. `Default.md` from the project repository. + ## Example description template We use description templates for issues and merge requests in the diff --git a/doc/user/project/settings/project_access_tokens.md b/doc/user/project/settings/project_access_tokens.md index 8664833a381..aa30c576c7c 100644 --- a/doc/user/project/settings/project_access_tokens.md +++ b/doc/user/project/settings/project_access_tokens.md @@ -114,5 +114,6 @@ Bot users for projects: When the project access token is [revoked](#revoke-a-project-access-token): - The bot user is deleted. -- All records are moved to a system-wide user with the username `Ghost User`. For more information, see - [associated records](../../profile/account/delete_account.md#associated-records). +- All records are moved to a system-wide user with the username [Ghost User](../../profile/account/delete_account.md#associated-records). + +See also [Bot users for groups](../../group/settings/group_access_tokens.md#bot-users-for-groups). |