summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-09-20 05:42:03 +0000
committerRuben Davila <rdavila84@gmail.com>2016-09-20 11:07:49 -0500
commit30e98e486a61ab52573b5b5cdce43966af4268ce (patch)
treeddd66b931c47d07c053ee7f62eef3a1026a8febd /CHANGELOG
parent3d26b41c4a4a8e3cc1b5c6419cd0b2a7f8d4f945 (diff)
downloadgitlab-ce-30e98e486a61ab52573b5b5cdce43966af4268ce.tar.gz
Merge branch 'strip-key-comments-for-gitlab-shell' into 'master'
Strip comments before sending keys to gitlab-shell ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/issues/22167 encoding issues in comment text. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/22167 See merge request !6381
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ab74f6ea03b..a5f0f95bfe0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -58,6 +58,7 @@ v 8.12.0 (unreleased)
- Add hover color to emoji icon (ClemMakesApps)
- Increase ci_builds artifacts_size column to 8-byte integer to allow larger files
- Add textarea autoresize after comment (ClemMakesApps)
+ - Do not write SSH public key 'comments' to authorized_keys !6381
- Refresh todos count cache when an Issue/MR is deleted
- Fix branches page dropdown sort alignment (ClemMakesApps)
- Hides merge request button on branches page is user doesn't have permissions