summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-07 13:33:19 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-07 13:33:19 +0000
commit29fc8ef8bbd6d4d363ce4a733af753c1990c1ba6 (patch)
treef07882ea4e354142c60549f29eed89d160d6315f
parent4a9f1818c25eb94ad711ff0b8e54eab9791be268 (diff)
downloadgitlab-ce-29fc8ef8bbd6d4d363ce4a733af753c1990c1ba6.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-12-stable-eev13.12.8
-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 fddf2902d72..0842a1c2170 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.12.8 (2021-07-07)
+
+### Security (1 change)
+
+- [Disable file and network premailer strategies](gitlab-org/security/gitlab@ee69d6d6950bb116cb31523ca805e78af431c25c) ([merge request](gitlab-org/security/gitlab!1545))
+
## 13.12.7 (2021-07-05)
### Fixed (2 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 73332f228d5..21edccba210 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-13.12.7 \ No newline at end of file
+13.12.8 \ No newline at end of file