diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-03 12:41:58 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-03 12:41:58 +0000 |
| commit | 0e2490c0cb9fca00baac08ae6b1280f62fa7d336 (patch) | |
| tree | 8511fe1766c450b0a684a3c7d5b0535e85917862 /CHANGELOG | |
| parent | 4c8d4c620c1e6af89de2a6e7407ac078744a0dcd (diff) | |
| parent | 4f726683cb59da54f47302880d5c0c447638402a (diff) | |
| download | gitlab-ce-0e2490c0cb9fca00baac08ae6b1280f62fa7d336.tar.gz | |
Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master'
Resolve "SHA parameter in accept merge request API"
Add a `sha` parameter to the MR merge API, which must match the source SHA for the branch to be merged.
Also add the same parameter to the UI:
@DouweM and I discussed adding some smart feature to that, like updating the source SHA on navigating to the diff tab, but for now it will just require a refresh :smiley:
Closes #14139.
See merge request !4414
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index ebbce3315ad..b876aee251d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,8 @@ 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 + - Don't allow MRs to be merged when commits were added since the last review / page load - 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) |