diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-13 15:27:19 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-13 15:27:19 +0400 |
| commit | 0c621708658da4b3cf88d805da5dbad920f3d27f (patch) | |
| tree | 99ae5d61a368da3cc7f1470d135f5c1aa2a2751c /CHANGELOG | |
| parent | 17858d49f6b189c922c7a69e94b5d8aa96fb48ad (diff) | |
| parent | 2d2b2da45a586bdf29e115dcb4b4f66f9a1feed0 (diff) | |
Merge branch 'api-mr-merge' into 'master'
Accept merge request API
This MR adds new endpoint `PUT /projects/:id/merge_request/:merge_request_id/merge`. After this change you can merge branches using API.
Fixes internal issue #1166
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index e44aa452e2a..be5da8bebfa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,7 @@ v 6.9.0 - Fix wiki backup skip bug - Two Step MR creation process - Remove unwanted files from satellite working directory with git clean -fdx + - Accept merge request via API (sponsored by O'Reilly Media) v 6.8.0 - Ability to at mention users that are participating in issue and merge req. discussion |