diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-23 21:46:06 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-23 21:46:06 +0000 |
commit | 0710560cf6fbcfad4bcd99811de8f01a9702bc90 (patch) | |
tree | 645aac46d20a424e40d2fa7fabe7e1c5e4c87cc1 /app/controllers/projects/commit_controller.rb | |
parent | d61c69f450f338f745e73c7dfba8c37416b443cd (diff) | |
parent | 56c36324a048c3e4c4668be9bc27bb92d6857cc9 (diff) | |
download | gitlab-ce-0710560cf6fbcfad4bcd99811de8f01a9702bc90.tar.gz |
Merge branch 'fix-bulk-assign' into 'master'
Fix unwanted label unassignment
## What does this MR do?
- When updating the milestone
- [x] Do not remove labels when assigning a milestone
- [x] Do not remove labels when unassigning a milestone
- [x] Do not remove labels when assigning a milestone and adding another label
- When toggling selected issues labels should be kept
- [x] Select an issue with an assigned label -> pick another label from dropdown-> unselect the issue -> select the issue again -> submit the form: Existing label should not be removed.
## Are there points in the code the reviewer needs to double check?
Labels should not be added or removed to issues when doing bulk actions unless we explicitly select a label from the dropdown
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4863
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
0 files changed, 0 insertions, 0 deletions