summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-08-09 13:17:37 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-08-09 13:17:37 +0100
commit567a994d65229bf8771f407f50da0cc3106bc712 (patch)
treec491e92b94a91513b6f7ca249f6b1cbcdbd69300
parentbd90fbc505a2474cbb3c90984831b84a56f6830a (diff)
downloadgitlab-ce-567a994d65229bf8771f407f50da0cc3106bc712.tar.gz
Update CHANGELOG.md for 9.4.4
[ci skip]
-rw-r--r--CHANGELOG.md5
-rw-r--r--changelogs/unreleased/fix-import-symbolink-links.yml4
-rw-r--r--changelogs/unreleased/rs-alphanumeric-ssh-params.yml5
3 files changed, 5 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa2b714ebf4..ea9b78c5de2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 9.4.4 (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.4.3 (2017-07-31)
- Fix Prometheus client PID reuse bug. !13130
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: