summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-08-29 11:46:03 +1000
committerSimon Knox <psimyn@gmail.com>2017-08-29 11:46:03 +1000
commit19490eab9f97644489fae7e3b674ca2fa4c37fac (patch)
tree7ad4758475214e5459d2a37cb64f6f4cd57e7884
parent0bbcf82205fbe594e979916ba568bcef3e9e95fc (diff)
downloadgitlab-ce-19490eab9f97644489fae7e3b674ca2fa4c37fac.tar.gz
Revert "Merge branch 'race-condition-in-project-uploads-fix-9-4' into 'security-9-4'"
This reverts commit 0bbcf82205fbe594e979916ba568bcef3e9e95fc.
-rw-r--r--changelogs/unreleased/race-condition-in-project-uploads-fix-9-4.yml4
1 files changed, 0 insertions, 4 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
deleted file mode 100644
index adf9d77bce8..00000000000
--- a/changelogs/unreleased/race-condition-in-project-uploads-fix-9-4.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fixes race condition in project uploads
-merge_request:
-author: