diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-06-01 10:21:22 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-06-01 20:29:54 +0100 |
| commit | d863d86aeb1993c2032da0610b3662e61960eb38 (patch) | |
| tree | 4eb83c80e800467aecc7922a5ffd987313a1fcb0 /CHANGELOG | |
| parent | e9bb895b5ac639bcb4166b23b796566f0320741a (diff) | |
| download | gitlab-ce-d863d86aeb1993c2032da0610b3662e61960eb38.tar.gz | |
Add `sha` parameter to MR accept API
The `sha` parameter is optional, and when present, must match the
current HEAD SHA of the source branch. Otherwise, the API call fails
with a 409 Conflict and a message containing the current HEAD for the
source branch.
Also tidy up some doc wording.
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 848aaa8506e..eb037e1ab8b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,7 @@ v 8.9.0 (unreleased) - Fix groups API to list only user's accessible projects - Redesign account and email confirmation emails - Use gitlab-shell v3.0.0 + - Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged - Add DB index on users.state - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database - Changed the Slack build message to use the singular duration if necessary (Aran Koning) |