Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-03-19 23:12:10 +0300
committerJames Lopez <james@jameslopez.es>2017-03-19 23:12:10 +0300
commit1f4af97f0a19c4cb9d48603a99f4fde0dfa826a9 (patch)
tree64054ea18d748820dfdbb26a8604510ceb2ceb21
parent78d47070ca515fd36cdcf89fe7518e44a71387ac (diff)
Update CHANGELOG.md for 8.17.4
[ci skip]
-rw-r--r--CHANGELOG.md5
-rw-r--r--changelogs/unreleased/28058-hide-emails-in-atom-feeds.yml4
-rw-r--r--changelogs/unreleased/ssrf-protections.yml4
3 files changed, 5 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e132554160f..27d887e8f59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 8.17.4 (2017-03-19)
+
+- Only show public emails in atom feeds.
+- To protect against Server-side Request Forgery project import URLs are now prohibited against localhost or the server IP except for the assigned instance URL and port. Imports are also prohibited from ports below 1024 with the exception of ports 22, 80, and 443.
+
## 8.17.3 (2017-03-07)
- Fix the redirect to custom home page URL. !9518
diff --git a/changelogs/unreleased/28058-hide-emails-in-atom-feeds.yml b/changelogs/unreleased/28058-hide-emails-in-atom-feeds.yml
deleted file mode 100644
index e0e826a67f8..00000000000
--- a/changelogs/unreleased/28058-hide-emails-in-atom-feeds.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Only show public emails in atom feeds
-merge_request:
-author:
diff --git a/changelogs/unreleased/ssrf-protections.yml b/changelogs/unreleased/ssrf-protections.yml
deleted file mode 100644
index 8d803738009..00000000000
--- a/changelogs/unreleased/ssrf-protections.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: To protect against Server-side Request Forgery project import URLs are now prohibited against localhost or the server IP except for the assigned instance URL and port. Imports are also prohibited from ports below 1024 with the exception of ports 22, 80, and 443.
-merge_request:
-author: