diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-09 00:07:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-09 00:07:12 +0300 |
commit | 58cad9b83fc4b319542586e2cab64e2fe7d12050 (patch) | |
tree | a5f94021664861ff5fdcbcfabc045c0a120d6133 /doc | |
parent | bb0d99269b1bee11939e6a3ddfcefed8c6fd4874 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
19 files changed, 26 insertions, 32 deletions
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 9884e6e8f34..3f998bdef31 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -5380,7 +5380,7 @@ Input type: `MemberRoleCreateInput` | <a id="mutationmemberrolecreategrouppath"></a>`groupPath` | [`ID!`](#id) | Group the member role to mutate is in. | | <a id="mutationmemberrolecreatemanageprojectaccesstokens"></a>`manageProjectAccessTokens` | [`Boolean`](#boolean) | Permission to admin project access tokens. | | <a id="mutationmemberrolecreatename"></a>`name` | [`String`](#string) | Name of the member role. | -| <a id="mutationmemberrolecreatepermissions"></a>`permissions` **{warning-solid}** | [`[String!]`](#string) | **Deprecated:** This feature is an Experiment. It can be changed or removed at any time. Introduced in 16.7. | +| <a id="mutationmemberrolecreatepermissions"></a>`permissions` **{warning-solid}** | [`[MemberRolePermission!]`](#memberrolepermission) | **Deprecated:** This feature is an Experiment. It can be changed or removed at any time. Introduced in 16.7. | | <a id="mutationmemberrolecreatereadcode"></a>`readCode` | [`Boolean`](#boolean) | Permission to read code. | | <a id="mutationmemberrolecreatereaddependency"></a>`readDependency` | [`Boolean`](#boolean) | Permission to read dependency. | | <a id="mutationmemberrolecreatereadvulnerability"></a>`readVulnerability` | [`Boolean`](#boolean) | Permission to read vulnerability. | diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index cc7dccc9342..8e8ee1a8477 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -206,7 +206,7 @@ Supported attributes: ### Merge requests list response notes -- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31890) in GitLab 13.0, listing merge requests may +- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31890) in GitLab 13.0, listing merge requests might not proactively update `merge_status` (which also affects the `has_conflicts`), as this can be an expensive operation. If you need the value of these fields from this endpoint, set the `with_merge_status_recheck` parameter to `true` in the query. @@ -1279,7 +1279,7 @@ POST /projects/:id/merge_requests | `milestone_id` | integer | No | The global ID of a milestone. | | `remove_source_branch` | boolean | No | Flag indicating if a merge request should remove the source branch when merging. | | `reviewer_ids` | integer array | No | The ID of the users added as a reviewer to the merge request. If set to `0` or left empty, no reviewers are added. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49341) in GitLab 13.8. | -| `squash` | boolean | No | Indicates if the merge request is set to be squashed when merged. [Project settings](../user/project/merge_requests/squash_and_merge.md#configure-squash-options-for-a-project) may override this value. | +| `squash` | boolean | No | Indicates if the merge request is set to be squashed when merged. [Project settings](../user/project/merge_requests/squash_and_merge.md#configure-squash-options-for-a-project) might override this value. | | `target_project_id` | integer | No | Numeric ID of the target project. | ```json diff --git a/doc/ci/pipelines/index.md b/doc/ci/pipelines/index.md index adeb1168644..957e0e0de27 100644 --- a/doc/ci/pipelines/index.md +++ b/doc/ci/pipelines/index.md @@ -262,18 +262,11 @@ In the example below, the `production` stage has a job with a manual action: ![Pipelines example](img/manual_pipeline_v14_2.png) -#### Start multiple manual actions in a stage +#### Start all manual jobs in a stage -> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/27188) in GitLab 11.11. - -Multiple manual actions in a single stage can be started at the same time using the "Play all manual" -After you select this action, each individual manual action is triggered and refreshed -to an updated status. - -This functionality is only available: - -- For users with at least the Developer role. -- If the stage contains [manual actions](#add-manual-interaction-to-your-pipeline). +If a stage contains only manual jobs, you can start all the jobs at the same time +by selecting **Play all manual** (**{play}**) above the stage. If the stage contains +non-manual jobs, the option is not displayed. ### Skip a pipeline diff --git a/doc/development/merge_request_concepts/diffs/index.md b/doc/development/merge_request_concepts/diffs/index.md index ed29b830dc5..ad0e8603983 100644 --- a/doc/development/merge_request_concepts/diffs/index.md +++ b/doc/development/merge_request_concepts/diffs/index.md @@ -21,7 +21,7 @@ We rely on different sources to present diffs. These include: In January 2019, Oswaldo Ferreira hosted a Deep Dive (GitLab team members only: `https://gitlab.com/gitlab-org/create-stage/-/issues/1`) on GitLab Diffs and Commenting on Diffs -functionality to share domain-specific knowledge with anyone who may work in this part of the +functionality to share domain-specific knowledge with anyone who works in this part of the codebase in the future: <!-- vale gitlab.Spelling = YES --> @@ -31,7 +31,7 @@ codebase in the future: - Slides on [Google Slides](https://docs.google.com/presentation/d/1bGutFH2AT3bxOPZuLMGl1ANWHqFnrxwQwjiwAZkF-TU/edit) - [PDF slides](https://gitlab.com/gitlab-org/create-stage/uploads/b5ad2f336e0afcfe0f99db0af0ccc71a/) -Everything covered in this deep dive was accurate as of GitLab 11.7, and while specific details may +Everything covered in this deep dive was accurate as of GitLab 11.7, and while specific details might have changed since then, it should still serve as a good introduction. ## Architecture overview diff --git a/doc/development/merge_request_concepts/index.md b/doc/development/merge_request_concepts/index.md index 40eb9231342..d04dff9f1be 100644 --- a/doc/development/merge_request_concepts/index.md +++ b/doc/development/merge_request_concepts/index.md @@ -27,7 +27,7 @@ The merge widget is the component of the merge request where the `merge` button ![merge widget](../img/merge_widget_v14_7.png) -This area of the merge request is where all of the options and commit messages are defined prior to merging. It also contains information about what is in the merge request, what issues may be closed, and other important information to the merging process. +This area of the merge request is where all of the options and commit messages are defined prior to merging. It also contains information about what is in the merge request, what issues are closed, and other information important to the merging process. ## Report widgets diff --git a/doc/tutorials/protected_workflow/index.md b/doc/tutorials/protected_workflow/index.md index 324aa5dc885..8e9ed3e952a 100644 --- a/doc/tutorials/protected_workflow/index.md +++ b/doc/tutorials/protected_workflow/index.md @@ -258,7 +258,7 @@ to protect multiple branches: to files they work on, toggle **Require approval from code owners**. 1. Select **Protect**. 1. In the table of branches, find the rule marked as `Default`. (Depending on - your version of GitLab, this branch may be named `main` or `master`.) Set the + your version of GitLab, this branch might be named `main` or `master`.) Set the values for this branch to match the settings you used for the `1.*` rule. Your rules are now in place, even though no `1.*` branches exist yet: diff --git a/doc/user/project/code_intelligence.md b/doc/user/project/code_intelligence.md index 7a4e4090cd6..a7f1aff9b02 100644 --- a/doc/user/project/code_intelligence.md +++ b/doc/user/project/code_intelligence.md @@ -40,7 +40,7 @@ code_navigation: lsif: dump.lsif ``` -The generated LSIF file size may be limited by +The generated LSIF file size might be limited by the [artifact application limits (`ci_max_artifact_size_lsif`)](../../administration/instance_limits.md#maximum-file-size-per-type-of-artifact), default to 100 MB (configurable by an instance administrator). diff --git a/doc/user/project/merge_requests/ai_in_merge_requests.md b/doc/user/project/merge_requests/ai_in_merge_requests.md index 2380df0b9fc..77072392692 100644 --- a/doc/user/project/merge_requests/ai_in_merge_requests.md +++ b/doc/user/project/merge_requests/ai_in_merge_requests.md @@ -80,7 +80,7 @@ Provide feedback on this experimental feature in [issue 408991](https://gitlab.c This feature is an [Experiment](../../../policy/experiment-beta-support.md) on GitLab.com. -When preparing to merge your merge request you may wish to edit the proposed squash or merge commit message. +When preparing to merge your merge request you might wish to edit the proposed squash or merge commit message. To generate a commit message with GitLab Duo: diff --git a/doc/user/project/merge_requests/authorization_for_merge_requests.md b/doc/user/project/merge_requests/authorization_for_merge_requests.md index 657a0582967..f0f2d3777f1 100644 --- a/doc/user/project/merge_requests/authorization_for_merge_requests.md +++ b/doc/user/project/merge_requests/authorization_for_merge_requests.md @@ -63,7 +63,7 @@ forks. Include any troubleshooting steps that you can foresee. If you know beforehand what issues one might have when setting this up, or when something is changed, or on upgrading, it's -important to describe those, too. Think of things that may go wrong and include them here. +important to describe those, too. Think of things that might go wrong and include them here. This is important to minimize requests for support, and to avoid doc comments with questions that you know someone might ask. diff --git a/doc/user/project/merge_requests/changes.md b/doc/user/project/merge_requests/changes.md index a091649482e..513010b01e2 100644 --- a/doc/user/project/merge_requests/changes.md +++ b/doc/user/project/merge_requests/changes.md @@ -84,7 +84,7 @@ The changes are displayed after the original text. ## Compare changes side-by-side -Depending on the length of the changes in your merge request, you may find it +Depending on the length of the changes in your merge request, you might find it easier to view the changes inline, or side-by-side: 1. On the left sidebar, select **Search or go to** and find your project. diff --git a/doc/user/project/merge_requests/commit_templates.md b/doc/user/project/merge_requests/commit_templates.md index 2659230fb57..2f4dae5178a 100644 --- a/doc/user/project/merge_requests/commit_templates.md +++ b/doc/user/project/merge_requests/commit_templates.md @@ -36,7 +36,7 @@ To do this: 1. For your desired commit type, enter your default message. You can use both static text and [variables](#supported-variables-in-commit-templates). Each template is limited to a maximum of 500 characters, though after replacing the templates - with data, the final message may be longer. + with data, the final message might be longer. 1. Select **Save changes**. ## Default template for merge commits diff --git a/doc/user/project/merge_requests/confidential.md b/doc/user/project/merge_requests/confidential.md index 4554fbec5ff..72fa836e60c 100644 --- a/doc/user/project/merge_requests/confidential.md +++ b/doc/user/project/merge_requests/confidential.md @@ -33,8 +33,8 @@ permissions in your downstream private fork without action by you. These users c immediately push code to branches in your private fork to help fix the confidential issue. WARNING: -Your private fork may expose confidential information, if you create it in a different -namespace than the upstream repository. The two namespaces may not contain the same users. +Your private fork might expose confidential information, if you create it in a different +namespace than the upstream repository. The two namespaces might not contain the same users. Prerequisites: diff --git a/doc/user/project/merge_requests/conflicts.md b/doc/user/project/merge_requests/conflicts.md index 93b1ca16732..d61753c3b40 100644 --- a/doc/user/project/merge_requests/conflicts.md +++ b/doc/user/project/merge_requests/conflicts.md @@ -168,7 +168,7 @@ merge commit. Verify it contains no unintended changes and doesn't break your bu Include any troubleshooting steps that you can foresee. If you know beforehand what issues one might have when setting this up, or when something is changed, or on upgrading, it's -important to describe those, too. Think of things that may go wrong and include them here. +important to describe those, too. Think of things that might go wrong and include them here. This is important to minimize requests for support, and to avoid doc comments with questions that you know someone might ask. diff --git a/doc/user/project/merge_requests/creating_merge_requests.md b/doc/user/project/merge_requests/creating_merge_requests.md index 723bda0e02c..26cbc4c5d8b 100644 --- a/doc/user/project/merge_requests/creating_merge_requests.md +++ b/doc/user/project/merge_requests/creating_merge_requests.md @@ -26,7 +26,7 @@ You can create a merge request from the list of merge requests. 1. Fill out the fields and select **Create merge request**. NOTE: -Merge requests are designed around a one-to-one (1:1) branch relationship. Only one open merge request may +Merge requests are designed around a one-to-one (1:1) branch relationship. Only one open merge request can be associated with a given target branch at a time. ## From an issue diff --git a/doc/user/project/merge_requests/drafts.md b/doc/user/project/merge_requests/drafts.md index ec9e5bb3f4f..67d24e72fed 100644 --- a/doc/user/project/merge_requests/drafts.md +++ b/doc/user/project/merge_requests/drafts.md @@ -78,7 +78,7 @@ if you want to run [merged results pipelines](../../../ci/pipelines/merged_resul Include any troubleshooting steps that you can foresee. If you know beforehand what issues one might have when setting this up, or when something is changed, or on upgrading, it's -important to describe those, too. Think of things that may go wrong and include them here. +important to describe those, too. Think of things that might go wrong and include them here. This is important to minimize requests for support, and to avoid doc comments with questions that you know someone might ask. diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 063b3a9ad95..3555d9ffa01 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -462,7 +462,7 @@ merge request to display an incorrect message: `merged into <branch-name>`. ### Close a merge request from the Rails console **(FREE SELF)** -If closing a merge request doesn't work through the UI or API, you may want to attempt to close it in a [Rails console session](../../../administration/operations/rails_console.md#starting-a-rails-console-session): +If closing a merge request doesn't work through the UI or API, you might want to attempt to close it in a [Rails console session](../../../administration/operations/rails_console.md#starting-a-rails-console-session): WARNING: Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore. @@ -476,7 +476,7 @@ MergeRequests::CloseService.new(project: p, current_user: u).execute(m) ### Delete a merge request from the Rails console **(FREE SELF)** -If deleting a merge request doesn't work through the UI or API, you may want to attempt to delete it in a [Rails console session](../../../administration/operations/rails_console.md#starting-a-rails-console-session): +If deleting a merge request doesn't work through the UI or API, you might want to attempt to delete it in a [Rails console session](../../../administration/operations/rails_console.md#starting-a-rails-console-session): WARNING: Any command that changes data directly could be damaging if not run correctly, diff --git a/doc/user/project/merge_requests/revert_changes.md b/doc/user/project/merge_requests/revert_changes.md index 22a6874156c..07523b9f34c 100644 --- a/doc/user/project/merge_requests/revert_changes.md +++ b/doc/user/project/merge_requests/revert_changes.md @@ -92,7 +92,7 @@ you must revert the commit from the command line: Include any troubleshooting steps that you can foresee. If you know beforehand what issues one might have when setting this up, or when something is changed, or on upgrading, it's -important to describe those, too. Think of things that may go wrong and include them here. +important to describe those, too. Think of things that might go wrong and include them here. This is important to minimize requests for support, and to avoid doc comments with questions that you know someone might ask. diff --git a/doc/user/project/merge_requests/versions.md b/doc/user/project/merge_requests/versions.md index 877f7bb77a8..62cee897b49 100644 --- a/doc/user/project/merge_requests/versions.md +++ b/doc/user/project/merge_requests/versions.md @@ -63,7 +63,7 @@ For more information, see how to [show or filter system notes on a merge request Include any troubleshooting steps that you can foresee. If you know beforehand what issues one might have when setting this up, or when something is changed, or on upgrading, it's -important to describe those, too. Think of things that may go wrong and include them here. +important to describe those, too. Think of things that might go wrong and include them here. This is important to minimize requests for support, and to avoid doc comments with questions that you know someone might ask. diff --git a/doc/user/search/advanced_search.md b/doc/user/search/advanced_search.md index bbc8838b640..3b715fb13da 100644 --- a/doc/user/search/advanced_search.md +++ b/doc/user/search/advanced_search.md @@ -33,6 +33,7 @@ You can use advanced search in: - On GitLab.com, advanced search is enabled for groups with paid subscriptions. - For self-managed GitLab instances, an administrator must [enable advanced search](../../integration/advanced_search/elasticsearch.md#enable-advanced-search). +- For GitLab Dedicated, advanced search is enabled. ## Syntax |