summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-08-16 23:51:22 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-08-16 23:51:22 +0530
commitd9efc7d9e6eb0b8247226c2fe2e929598f297056 (patch)
tree4b7347e8c462d65b12c87a2292d7879ee44fbaf2 /CHANGELOG
parent8c101fc313208b2256f9b9a2d596a0b398f173e0 (diff)
parent7f853e2245eff92c037af5e007163d3e9631888d (diff)
downloadgitlab-ce-d9efc7d9e6eb0b8247226c2fe2e929598f297056.tar.gz
Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changes
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fc9291eefd5..9299639a3ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -117,6 +117,9 @@ v 8.11.0 (unreleased)
- Speed up todos queries by limiting the projects set we join with
- Ensure file editing in UI does not overwrite commited changes without warning user
+v 8.10.6 (unreleased)
+ - Fix import/export configuration missing some included attributes
+
v 8.10.5
- Add a data migration to fix some missing timestamps in the members table. !5670
- Revert the "Defend against 'Host' header injection" change in the source NGINX templates. !5706