summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-07 13:24:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-07 13:24:40 +0000
commit7fd059d6f16ac5af6572303dd21f3c0eca61ad43 (patch)
tree326752bc8f52f2d2e4b990795aa3fc11eae4cbc1
parent57c0525046e9a276dc12a6a163cd31816cf383ce (diff)
downloadgitlab-ce-14.0.4.tar.gz
Add latest changes from gitlab-org/security/gitlab@14-0-stable-eev14.0.4
-rw-r--r--CHANGELOG.md6
-rw-r--r--GITALY_SERVER_VERSION2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f47dc60d456..528f8455efe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 14.0.4 (2021-07-07)
+
+### Security (1 change)
+
+- [Disable file and network premailer strategies](gitlab-org/security/gitlab@4af58e3d8ee1b25048f34208db6e685cf0bf1411) ([merge request](gitlab-org/security/gitlab!1544))
+
## 14.0.3 (2021-07-06)
### Fixed (7 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 3b0c3fb7919..25f846fc802 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-14.0.3 \ No newline at end of file
+14.0.4 \ No newline at end of file