summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-03-27 11:58:44 +0100
committerFilipa Lacerda <filipa@gitlab.com>2018-03-27 11:58:44 +0100
commit463fe4062dacb5e124a24d245fb921b91f6d499b (patch)
treeb56f10678d38fb266479fd68cb598e1e0a933823 /CHANGELOG.md
parentdcfe895098dd15fd79d29a6861686258ac236e24 (diff)
downloadgitlab-ce-463fe4062dacb5e124a24d245fb921b91f6d499b.tar.gz
Update CHANGELOG.md for 10.6.1
[ci skip]
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md20
1 files changed, 20 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4426cd20732..adb0ec9f5b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,26 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.6.1 (2018-03-27)
+
+### Security (1 change)
+
+- Bump rails-html-sanitizer to 1.0.4.
+
+### Fixed (2 changes)
+
+- Prevent auto-retry AccessDenied error from stopping transition to failed. !17862
+- Fix 500 error when trying to resolve non-ASCII conflicts in the editor. !17962
+
+### Performance (1 change)
+
+- Add indexes for user activity queries. !17890
+
+### Other (1 change)
+
+- Add documentation for runner IP address (#44232). !17837
+
+
## 10.6.0 (2018-03-22)
### Security (4 changes)