diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-28 15:08:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-28 15:08:39 +0300 |
commit | aaff41e10e8c03e545af9ba157e79f67686972a0 (patch) | |
tree | dbfc8ba40f533bd62bd1ffae500ebb43bceb5878 /doc | |
parent | c00c766f13d6e0291831a25434eb54057708cc47 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/object_storage.md | 1 | ||||
-rw-r--r-- | doc/api/members.md | 2 | ||||
-rw-r--r-- | doc/development/documentation/styleguide/word_list.md | 5 | ||||
-rw-r--r-- | doc/update/zero_downtime.md | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/doc/administration/object_storage.md b/doc/administration/object_storage.md index 2bf3ef0275c..aa17452f260 100644 --- a/doc/administration/object_storage.md +++ b/doc/administration/object_storage.md @@ -114,7 +114,6 @@ The following table lists the valid `objects` that can be used: | `dependency_proxy` | [Dependency Proxy](packages/dependency_proxy.md) | | `terraform_state` | [Terraform state files](terraform_state.md) | | `pages` | [Pages](pages/index.md) | -| `ci_secure_files` | [Project-level Secure Files](secure_files.md) | Within each object type, three parameters can be defined: diff --git a/doc/api/members.md b/doc/api/members.md index 02fa4be3d64..74b6b813bd7 100644 --- a/doc/api/members.md +++ b/doc/api/members.md @@ -521,7 +521,7 @@ POST /projects/:id/members | `user_id` | integer/string | yes | The user ID of the new member or multiple IDs separated by commas | | `access_level` | integer | yes | A valid access level | | `expires_at` | string | no | A date string in the format `YEAR-MONTH-DAY` | -| `invite_source` | string | no | The source of the invitation that starts the member creation process. See [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/327120). | +| `invite_source` | string | no | The source of the invitation that starts the member creation process. GitLab team members can view more information in this confidential issue: `https://gitlab.com/gitlab-org/gitlab/-/issues/327120>`. | | `tasks_to_be_done` | array of strings | no | Tasks the inviter wants the member to focus on. The tasks are added as issues to a specified project. The possible values are: `ci`, `code` and `issues`. If specified, requires `tasks_project_id`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69299) in GitLab 14.5 [with a flag](../administration/feature_flags.md) named `invite_members_for_task`. Disabled by default. | | `tasks_project_id` | integer | no | The project ID in which to create the task issues. If specified, requires `tasks_to_be_done`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69299) in GitLab 14.5 [with a flag](../administration/feature_flags.md) named `invite_members_for_task`. Disabled by default. | diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md index a1c3b1220eb..8c249e3f391 100644 --- a/doc/development/documentation/styleguide/word_list.md +++ b/doc/development/documentation/styleguide/word_list.md @@ -1166,7 +1166,10 @@ Use lowercase for **personal access token**. ## please -Do not use **please**. For more information, see the [Microsoft Style Guide](https://learn.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/p/please). +Do not use **please** in the product documentation. + +In UI text, use **please** when we've inconvenienced the user. For more information, +see the [Microsoft Style Guide](https://learn.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/p/please). ## Premium diff --git a/doc/update/zero_downtime.md b/doc/update/zero_downtime.md index c815087b0b3..7a0f49b6fe7 100644 --- a/doc/update/zero_downtime.md +++ b/doc/update/zero_downtime.md @@ -15,7 +15,7 @@ there are the following requirements: sequence [and leave the database schema in a broken state](https://gitlab.com/gitlab-org/gitlab/-/issues/321542). - You have to use [post-deployment migrations](../development/database/post_deployment_migrations.md). - You are using PostgreSQL. Starting from GitLab 12.1, MySQL is not supported. -- You have set up a multi-node GitLab instance. Single-node instances do not support zero-downtime upgrades. +- You have set up a multi-node GitLab instance. Cloud Native Hybrid installations do [not support zero-downtime upgrades](../administration/reference_architectures/index.md#zero-downtime-upgrades). If you want to upgrade multiple releases or do not meet the other requirements: |