diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-24 18:19:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-24 18:19:04 +0000 |
| commit | 94ca43181461c52ca0381d414387b02e579dbc61 (patch) | |
| tree | 0d73744d7a846e831f2350bf97aa14a4c2dc7d14 /doc/api/merge_requests.md | |
| parent | c4b4a75c35cb2015c01ef0b60f8ad8baaaf889df (diff) | |
| download | gitlab-ce-94ca43181461c52ca0381d414387b02e579dbc61.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/merge_requests.md')
| -rw-r--r-- | doc/api/merge_requests.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 9b9af46955d..0c065c0f2f5 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -775,8 +775,8 @@ the `approvals_before_merge` parameter: ### Single merge request response notes - The `merge_status` field may hold one of the following values: - - `unchecked`: We have not checked this yet. - - `checking`: We are currently checking if the merge request can be merged. + - `unchecked`: This merge request has not yet been checked. + - `checking`: This merge request is currently being checked to see if it can be merged. - `can_be_merged`: This merge request can be merged without conflict. - `cannot_be_merged`: There are merge conflicts between the source and target branches. - `cannot_be_merged_recheck`: Currently unchecked. Before the current changes, there were conflicts. |