diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-02 15:10:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-02 15:10:05 +0300 |
| commit | 2e4e6e9bb63212c628e67c6865fa39f62217a83d (patch) | |
| tree | 207b9f8d3a7bd6bce448935fea21601744035e40 /doc/api/merge_requests.md | |
| parent | b2180a27bcf74e622df4d7fb173306d80b973a6c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/merge_requests.md')
| -rw-r--r-- | doc/api/merge_requests.md | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index c4cb7753fc9..fd5da7d9180 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -405,6 +405,16 @@ Parameters: ] ``` +The `merge_status` field may hold one of the following values: + +| Value | Interpretation | +|----------------------------|-----------------------------------------------------------------------| +| `unchecked` | We have not checked this yet | +| `checking` | We are currently checking if the merge request 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 | + Users on GitLab Premium or higher also see the `approvals_before_merge` parameter: |