diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-13 13:19:56 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-13 13:19:56 +0000 |
| commit | b3e989b057ff9cd1973f0927b4b0f0d28b1e0c6b (patch) | |
| tree | 05fb4bf893259319bef3b229eb72724191b3ac29 /CHANGELOG | |
| parent | 2362dfee686ab715ef6a3bd00b389ab321e7a728 (diff) | |
| parent | 3c476ee62512a0642ca3e5e6b228f9abdd867a34 (diff) | |
| download | gitlab-ce-b3e989b057ff9cd1973f0927b4b0f0d28b1e0c6b.tar.gz | |
Merge branch '23234-deleting-a-milestone-removes-source-branch-deletion-options-of-associated-merge-requests' into 'master'
Maintain "force_remove_source_branch" options on Merge Request unless specified
## What does this MR do?
Fixes a problem where Merge Requests were losing the state associated with the flag to remove the source branch upon merge
* Closes #23234
* Closes #23191
* Closes #19351
See merge request !6817
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4b1ac9d2c3c..4de2069b9f8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -33,6 +33,7 @@ v 8.13.0 (unreleased) - Update Gitlab Shell to fix some problems with moving projects between storages - Cache rendered markdown in the database, rather than Redis - Avoid database queries on Banzai::ReferenceParser::BaseParser for nodes without references + - Do not alter 'force_remove_source_branch' options on MergeRequest unless specified - Simplify Mentionable concern instance methods - API: Ability to retrieve version information (Robert Schilling) - Fix permission for setting an issue's due date |