summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Azzopardi <sazzopardi@gitlab.com>2018-11-26 08:00:33 +0000
committerSteve Azzopardi <sazzopardi@gitlab.com>2018-11-26 08:00:33 +0000
commit93478d3ab04a886cc1a0ea0762b9ab5b74af15e6 (patch)
treec38ad9c1b8ab7de66e91889250e7d8032b38a736
parentf2b8deb46698e130a7bebced51ca31c31a61b006 (diff)
parent1d6fd012d5c98d6d86da0cefb8bf70a58e084e5f (diff)
downloadgitlab-ce-93478d3ab04a886cc1a0ea0762b9ab5b74af15e6.tar.gz
Merge branch 'security-11-4-pages-toctou-race' into 'security-11-4'
[11.4] [pages] Possible symlink time of check to time of use race condition See merge request gitlab/gitlabhq!2650
-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 9084fa2f716..524cb55242b 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-1.1.0
+1.1.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