diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-22 00:38:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-22 00:38:51 +0000 |
| commit | 28f9b54372cd2d7b7ac930c2a4968ca435382851 (patch) | |
| tree | 0c25395e1f5bb5a0578b35ead0be006baf5b6cd8 /CHANGELOG | |
| parent | 1367caa642e7ec9a46f202b6149a01e7093c573d (diff) | |
| parent | 6febe1007ef6fec4507d81a5579c2766cd188a17 (diff) | |
| download | gitlab-ce-28f9b54372cd2d7b7ac930c2a4968ca435382851.tar.gz | |
Merge branch 'merge-when-succeeded' into 'master'
Fix bugs in MergeWhenSucceeded
1. This fixes support for merge when succeeded for statuses without ref.
2. This fixes support for merge when succeeded for multiple stages. Stages are created after all builds for previous one are finished.
Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/9060 https://gitlab.com/gitlab-org/gitlab-ce/issues/8108 https://gitlab.com/gitlab-org/gitlab-ce/issues/12931 https://gitlab.com/gitlab-org/gitlab-ce/issues/13269
/cc @grzesiek @DouweM @rspeicher
See merge request !2894
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8a95909eee9..b31e134918c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -46,12 +46,14 @@ v 8.5.0 (unreleased) - Deprecate API "merge_request/:merge_request_id/comments". Use "merge_requests/:merge_request_id/notes" instead - Deprecate API "merge_request/:merge_request_id/...". Use "merge_requests/:merge_request_id/..." instead - Prevent parse error when name of project ends with .atom and prevent path issues + - Discover branches for commit statuses ref-less when doing merge when succeeded - Mark inline difference between old and new paths when a file is renamed - Support Akismet spam checking for creation of issues via API (Stan Hu) - API: Allow to set or update a merge-request's milestone (Kirill Skachkov) - Improve UI consistency between projects and groups lists - Add sort dropdown to dashboard projects page - Fixed logo animation on Safari (Roman Rott) + - Fix Merge When Succeeded when multiple stages - Hide remove source branch button when the MR is merged but new commits are pushed (Zeger-Jan van de Weg) - In seach autocomplete show only groups and projects you are member of - Don't process cross-reference notes from forks |