summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2018-12-13 15:10:19 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2018-12-13 15:10:19 +0000
commitd5b0109aa71e56b92890861029c3d28297669849 (patch)
tree3d0bf33c90fc9de14824388c9a90c2ba6452d02c
parent419a17a40f83d3676f94dd57a75aa8f03d58605f (diff)
downloadgitlab-ce-d5b0109aa71e56b92890861029c3d28297669849.tar.gz
Update CHANGELOG.md for 11.4.11
[ci skip]
-rw-r--r--CHANGELOG.md7
-rw-r--r--changelogs/unreleased/security-2754-fix-lfs-import.yml5
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 505ff96ded2..6c31061de3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 11.4.11 (2018-12-13)
+
+### Security (1 change)
+
+- Validate LFS hrefs before downloading them.
+
+
## 11.4.10 (2018-12-06)
### Security (1 change)
diff --git a/changelogs/unreleased/security-2754-fix-lfs-import.yml b/changelogs/unreleased/security-2754-fix-lfs-import.yml
deleted file mode 100644
index e8e74c9c3f6..00000000000
--- a/changelogs/unreleased/security-2754-fix-lfs-import.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Validate LFS hrefs before downloading them
-merge_request:
-author:
-type: security