diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 18:09:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 18:09:17 +0300 |
| commit | 194b499aa8e26df26ff70a1e1ce0396587bd5243 (patch) | |
| tree | c873ac9c3096faf4a5da43d6670107461da2a7d7 /doc/api | |
| parent | 43b4b3e2d2ddebc0a89b94a8251c162ec5719780 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/merge_requests.md | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 3c31ebf067b..0b90b277d6f 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -64,9 +64,12 @@ Parameters: NOTE: **Note:** [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 -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 [ @@ -538,9 +541,12 @@ Parameters: NOTE: **Note:** [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 -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 { |