summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Azzopardi <sazzopardi@gitlab.com>2018-11-26 07:58:29 +0000
committerSteve Azzopardi <sazzopardi@gitlab.com>2018-11-26 07:58:29 +0000
commit4ad82e69ba171980805ffaf994d18ace23f64d74 (patch)
treede7878c27e8f57d8e0cb35484ff1ccbef15d5052
parent07729f3ce6a04a5de37840ff9339edbb93ad1358 (diff)
parentfa6e4de528cd7ff3d85ea89b505ca7b19253bc81 (diff)
downloadgitlab-ce-4ad82e69ba171980805ffaf994d18ace23f64d74.tar.gz
Merge branch 'security-11-5-pages-toctou-race' into 'security-11-5'
[11.5] [pages] Possible symlink time of check to time of use race condition See merge request gitlab/gitlabhq!2649
-rw-r--r--GITLAB_PAGES_VERSION2
-rw-r--r--changelogs/unreleased/security-pages-toctou-race.yml6
2 files changed, 7 insertions, 1 deletions
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION
index f0bb29e7638..3a3cd8cc8b0 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-1.3.0
+1.3.1
diff --git a/changelogs/unreleased/security-pages-toctou-race.yml b/changelogs/unreleased/security-pages-toctou-race.yml
new file mode 100644
index 00000000000..1c055f6087f
--- /dev/null
+++ b/changelogs/unreleased/security-pages-toctou-race.yml
@@ -0,0 +1,6 @@
+---
+title: Fix a possible symlink time of check to time of use race condition in GitLab
+ Pages
+merge_request:
+author:
+type: security