Commit 1a5a3a2e authored by Patrick Bajao's avatar Patrick Bajao

Add info to API doc has_conflicts dependency

Also specify that `async_merge_request_check_mergeability` needs
to be enabled to have this behavior.
parent 5f46d0b1
...@@ -64,9 +64,12 @@ Parameters: ...@@ -64,9 +64,12 @@ Parameters:
NOTE: **Note:** NOTE: **Note:**
[Starting in GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/issues/29984), [Starting in GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/issues/29984),
the mergeability (`merge_status`) of each merge request will be checked when `async_merge_request_check_mergeability` feature flag is enabled, the
mergeability (`merge_status`) of each merge request will be checked
asynchronously when a request is made to this endpoint. Poll this API endpoint asynchronously when a request is made to this endpoint. Poll this API endpoint
to get updated status. to get updated status. This affects the `has_conflicts` property as it is
dependent on the `merge_status`. It'll return `false` unless `merge_status` is
`cannot_be_merged`.
```json ```json
[ [
...@@ -538,9 +541,12 @@ Parameters: ...@@ -538,9 +541,12 @@ Parameters:
NOTE: **Note:** NOTE: **Note:**
[Starting in GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/issues/29984), [Starting in GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/issues/29984),
the mergeability (`merge_status`) of a merge request will be checked when `async_merge_request_check_mergeability` feature flag is enabled, the
mergeability (`merge_status`) of a merge request will be checked
asynchronously when a request is made to this endpoint. Poll this API endpoint asynchronously when a request is made to this endpoint. Poll this API endpoint
to get updated status. to get updated status. This affects the `has_conflicts` property as it is
dependent on the `merge_status`. It'll return `false` unless `merge_status` is
`cannot_be_merged`.
```json ```json
{ {
......
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