diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-02 00:08:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-02 00:08:18 +0300 |
commit | 61666f277a484725307ae2b34697b13a300b2129 (patch) | |
tree | 01f93083ca2cb9d0eeca1443a23c31a4bdbd5532 /doc | |
parent | 4e3a998b8ec1351d8345863f6cad4b9bd497bd6a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/api/merge_requests.md | 28 | ||||
-rw-r--r-- | doc/development/value_stream_analytics.md | 3 | ||||
-rw-r--r-- | doc/development/value_stream_analytics/value_stream_analytics_aggregated_backend.md | 4 | ||||
-rw-r--r-- | doc/user/analytics/value_stream_analytics.md | 2 | ||||
-rw-r--r-- | doc/user/group/contribution_analytics/index.md | 3 | ||||
-rw-r--r-- | doc/user/group/value_stream_analytics/index.md | 2 |
6 files changed, 21 insertions, 21 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 2c52b3c1f55..5843a10ca59 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -839,20 +839,20 @@ Supported attributes: Use `detailed_merge_status` instead of `merge_status` to account for all potential statuses. -- The `detailed_merge_status` field may hold one of the following values: - - `blocked_status`: Merge request is blocked by another merge request. - - `broken_status`: Can not merge the source into the target branch, potential conflict. - - `checking`: currently checking for mergeability. - - `ci_must_pass`: Pipeline must succeed before merging. - - `ci_still_running`: Pipeline is still running. - - `discussions_not_resolved`: Discussions must be resolved before merging. - - `draft_status`: Merge request must not be draft before merging. - - `external_status_checks`: Status checks must pass. - - `mergeable`: branch can be merged. - - `not_approved`: Merge request must be approved before merging. - - `not_open`: merge request must be open before merging. - - `policies_denied`: There are denied policies for the merge request. - - `unchecked`: merge status has not been checked. +- The `detailed_merge_status` field can contain one of the following values related to the merge request: + - `blocked_status`: Blocked by another merge request. + - `broken_status`: Can't merge into the target branch due to a potential conflict. + - `checking`: Mergeability checks are still in progress. + - `ci_must_pass`: A CI/CD pipeline must succeed before merge. + - `ci_still_running`: A CI/CD pipeline is still running. + - `discussions_not_resolved`: All discussions must be resolved before merge. + - `draft_status`: Can't merge because the merge request is a draft. + - `external_status_checks`: All status checks must pass before merge. + - `mergeable`: The branch can merge cleanly into the target branch. + - `not_approved`: Approval is required before merge. + - `not_open`: The merge request must be open before merge. + - `policies_denied`: The merge request contains denied policies. + - `unchecked`: The merge status has not been checked. ## Get single merge request participants diff --git a/doc/development/value_stream_analytics.md b/doc/development/value_stream_analytics.md index 0d321133705..ace921b3978 100644 --- a/doc/development/value_stream_analytics.md +++ b/doc/development/value_stream_analytics.md @@ -89,7 +89,8 @@ They're responsible for defining a timestamp expression that is used in the calc #### Implementing an `Event` class -There are a few methods that are required to be implemented, the `StageEvent` base class describes them in great detail. The most important ones are: +You must implement a few methods, as described in the `StageEvent` base class. +The most important methods are: - `object_type` - `timestamp_projection` diff --git a/doc/development/value_stream_analytics/value_stream_analytics_aggregated_backend.md b/doc/development/value_stream_analytics/value_stream_analytics_aggregated_backend.md index a07998550bf..c477b3d9015 100644 --- a/doc/development/value_stream_analytics/value_stream_analytics_aggregated_backend.md +++ b/doc/development/value_stream_analytics/value_stream_analytics_aggregated_backend.md @@ -56,7 +56,7 @@ database with a minimal development effort. ![vsa object hierarchy example](img/object_hierarchy_example_V14_10.png) -In this example, there are two independent value streams set up for two teams that are using +In this example, two independent value streams are set up for two teams that are using different development workflows within the `Test Group` (top-level namespace). The first value stream uses standard timestamp-based events for defining the stages. The second @@ -102,7 +102,7 @@ High-level overview for each top-level namespace with Premium or Ultimate licens 1. `INSERT` or `UPDATE` the data into the VSA database tables. The data loading is implemented within the [`Analytics::CycleAnalytics::DataLoaderService`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/app/services/analytics/cycle_analytics/data_loader_service.rb) -class. There are groups containing a lot of data, so to avoid overloading the primary database, +class. Some groups contain a lot of data, so to avoid overloading the primary database, the service performs operations in batches and enforces strict application limits: - Load records in batches. diff --git a/doc/user/analytics/value_stream_analytics.md b/doc/user/analytics/value_stream_analytics.md index ab68c897da8..0906f7d17a7 100644 --- a/doc/user/analytics/value_stream_analytics.md +++ b/doc/user/analytics/value_stream_analytics.md @@ -204,7 +204,7 @@ Value stream analytics records the following times for each stage: - **Review**: 14:00 to 19:00: 5 hrs - **Staging**: 19:00 to 19:30: 30 minutes -There are some additional considerations for this example: +Keep in mind the following observations related to this example: - Although this example specifies the issue number in a later commit, the process still collects analytics data for the issue. diff --git a/doc/user/group/contribution_analytics/index.md b/doc/user/group/contribution_analytics/index.md index b1efd2e9251..ddf468e39b0 100644 --- a/doc/user/group/contribution_analytics/index.md +++ b/doc/user/group/contribution_analytics/index.md @@ -24,8 +24,7 @@ To view Contribution Analytics: ## Using Contribution Analytics -There are three main bar graphs that illustrate the number of contributions per group -member for the following: +Three bar graphs illustrate the number of contributions made by each group member: - Push events - Merge requests diff --git a/doc/user/group/value_stream_analytics/index.md b/doc/user/group/value_stream_analytics/index.md index 980618ac3ae..1c02ca59e3d 100644 --- a/doc/user/group/value_stream_analytics/index.md +++ b/doc/user/group/value_stream_analytics/index.md @@ -223,7 +223,7 @@ Value stream analytics records the following times for each stage: - **Review**: 14:00 to 19:00: 5 hrs - **Staging**: 19:00 to 19:30: 30 minutes -There are some additional considerations for this example: +Keep in mind the following observations related to this example: - This example demonstrates that it doesn't matter if your first commit doesn't mention the issue number, you can do this later in any commit |