summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-07 13:44:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-07 13:44:24 +0000
commit856079e507a1444053d2bae930215fade2cae3c8 (patch)
tree9cc8fc6751b04b9048c7f40e6512be4cd89e9300
parentd55d8314f8253fb9d71432a80cdceb11e9b84187 (diff)
downloadgitlab-ce-13.11.7.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-11-stable-eev13.11.7
-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 34e230eef3d..514c86ac088 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.11.7 (2021-07-07)
+
+### Security (1 change)
+
+- [Disable file and network premailer strategies](gitlab-org/security/gitlab@511ed3746b48a26e95c851f76ac6fdcd44c28fd8) ([merge request](gitlab-org/security/gitlab!1546))
+
## 13.11.6 (2021-07-01)
### Added (1 change)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 660b76199a1..248623c13ac 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-13.11.6 \ No newline at end of file
+13.11.7 \ No newline at end of file