From baa8cfab7e2d8f40e4cb3a02651bb7a4ab2da95c Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Wed, 9 Aug 2017 15:15:43 -0700 Subject: Update CHANGELOG.md for 9.2.10 [ci skip] --- CHANGELOG.md | 5 +++++ changelogs/unreleased/fix-import-symbolink-links.yml | 4 ---- changelogs/unreleased/rs-alphanumeric-ssh-params.yml | 5 ----- 3 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 changelogs/unreleased/fix-import-symbolink-links.yml delete mode 100644 changelogs/unreleased/rs-alphanumeric-ssh-params.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index b91e67efd14..9a9aa6319c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 9.2.10 (2017-08-09) + +- Remove hidden symlinks from project import files. +- Disallow Git URLs that include a username or hostname beginning with a non-alphanumeric character. + ## 9.2.9 (2017-07-20) - Fix an infinite loop when handling user-supplied regular expressions. diff --git a/changelogs/unreleased/fix-import-symbolink-links.yml b/changelogs/unreleased/fix-import-symbolink-links.yml deleted file mode 100644 index 36e73821bdc..00000000000 --- a/changelogs/unreleased/fix-import-symbolink-links.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Remove hidden symlinks from project import files -merge_request: -author: diff --git a/changelogs/unreleased/rs-alphanumeric-ssh-params.yml b/changelogs/unreleased/rs-alphanumeric-ssh-params.yml deleted file mode 100644 index 426b01cafad..00000000000 --- a/changelogs/unreleased/rs-alphanumeric-ssh-params.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Disallow Git URLs that include a username or hostname beginning with a non-alphanumeric - character -merge_request: -author: -- cgit v1.2.1