summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-07-24 13:15:17 +0000
committerSimon Knox <psimyn@gmail.com>2017-08-29 10:42:38 +1000
commit0bbcf82205fbe594e979916ba568bcef3e9e95fc (patch)
treed324a79f4852a00de4fb8b3786c6240eba096907
parent659119a6d080c5d91bcd155cb4c79c85d993c311 (diff)
downloadgitlab-ce-0bbcf82205fbe594e979916ba568bcef3e9e95fc.tar.gz
Merge branch 'race-condition-in-project-uploads-fix-9-4' into 'security-9-4'
Fixes race condition in project uploads See merge request !2141
-rw-r--r--changelogs/unreleased/race-condition-in-project-uploads-fix-9-4.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/race-condition-in-project-uploads-fix-9-4.yml b/changelogs/unreleased/race-condition-in-project-uploads-fix-9-4.yml
new file mode 100644
index 00000000000..adf9d77bce8
--- /dev/null
+++ b/changelogs/unreleased/race-condition-in-project-uploads-fix-9-4.yml
@@ -0,0 +1,4 @@
+---
+title: Fixes race condition in project uploads
+merge_request:
+author: