diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-09 19:01:20 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-09 19:01:20 +0300 |
| commit | 6b0801d4f3bcdce5c7aaeb31227782293abbfa68 (patch) | |
| tree | 682d9c516915226d81022d8aedaa28d2f8a778f7 /CHANGELOG | |
| parent | f86ff1b833eb04dfc66638bdff110fa7cb9b2360 (diff) | |
| parent | f6a666bdc2b9b557247c34935b69f35fb518e348 (diff) | |
Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master'
Expose MergeRequest#merge_status
_Originally opened at !2478 by @develop7._
- - -
This enables API users to see whether a merge request can be merged without conflicts.
See merge request !2756
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 668e12ae258..4694421f040 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -29,6 +29,7 @@ v 8.5.0 (unreleased) - Update the ExternalIssue regex pattern (Blake Hitchcock) - Remember user's inline/side-by-side diff view preference in a cookie (Kirill Katsnelson) - Optimized performance of finding issues to be closed by a merge request + - API: Expose MergeRequest#merge_status (Andrei Dziahel) - Revert "Add IP check against DNSBLs at account sign-up" - Fix API to keep request parameters in Link header (Michael Potthoff) - Deprecate API "merge_request/:merge_request_id/comments". Use "merge_requests/:merge_request_id/notes" instead |