diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-10-12 13:17:35 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-10-12 13:17:35 +0300 |
| commit | d1eab555b6f38552841a7a1d956c241d91a6f2d4 (patch) | |
| tree | bc4b6e856e2b9834d295f2fe9934a88e1d7ddf78 /CHANGELOG | |
| parent | d3a9838065ab4cd4d1519f6d201b43c9a2b12f2c (diff) | |
| parent | c90483406ecc2717076391737ff57167b5a03393 (diff) | |
Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master'
Removes inconsistency regarding tagging immediately as merged once you create a …
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #20708
See merge request !6408
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 201bab610ba..fc362ac3669 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -150,6 +150,7 @@ v 8.12.1 - Fix issue with search filter labels not displaying v 8.12.0 + - Removes inconsistency regarding tagging immediatelly as merged once you create a new branch. !6408 - Update the rouge gem to 2.0.6, which adds highlighting support for JSX, Prometheus, and others. !6251 - Only check :can_resolve permission if the note is resolvable - Bump fog-aws to v0.11.0 to support ap-south-1 region |