Update CHANGELOG.md for 10.6.1

[ci skip]

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)

changelogs/unreleased/44232-docs-for-runner-ip-address.yml

----
-title: Add documentation for runner IP address (#44232)
-merge_request: 17837
-author:
-type: other

changelogs/unreleased/44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error.yml

----
-title: Fix 500 error when trying to resolve non-ASCII conflicts in the editor
-merge_request: 17962
-author:
-type: fixed

changelogs/unreleased/ab-44446-add-indexes-for-user-activity-queries.yml

----
-title: Add indexes for user activity queries.
-merge_request: 17890
-author:
-type: performance

changelogs/unreleased/fix-ci-job-auto-retry.yml

----
-title: Prevent auto-retry AccessDenied error from stopping transition to failed
-merge_request: 17862
-author:
-type: fixed

changelogs/unreleased/sh-update-loofah.yml

----
-title: Bump rails-html-sanitizer to 1.0.4
-merge_request:
-author:
-type: security