Commit 016cf112 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'mr-api-doc-v2' into 'master'

Updated wording in doc/api/merge_requests.md response notes

See merge request gitlab-org/gitlab!81416
parents aa956a4b 07499a99
......@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment