summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-08-01 11:19:58 +0000
committerRémy Coutable <remy@rymai.me>2016-08-01 11:19:58 +0000
commite91fe7553db6f1e9d286df4941a1847f27a767d5 (patch)
tree90020bb85f37ee8af6189749b4f04672f8f43689 /CHANGELOG
parentf46d5f5813f5c0fe9c88435c8bda9af08447ef16 (diff)
parentaad0ae71620d8e988faf75587a612b933df00366 (diff)
downloadgitlab-ce-e91fe7553db6f1e9d286df4941a1847f27a767d5.tar.gz
Merge branch 'fix/labels-milestones-import' into 'master'
Fix Importing labels and milestones associations - Import/Export Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19510 and https://gitlab.com/gitlab-org/gitlab-ce/issues/19447 - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5426
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d6d6756a627..95aeda301f7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.10.3 (unreleased)
- Fix hooks missing on imported GitLab projects
- Properly abort a merge when merge conflicts occur
- Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured.
+ - Fix Import/Export issue importing milestones and labels not associated properly
v 8.10.2
- User can now search branches by name. !5144