summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-08-14 13:38:43 +0000
committerSimon Knox <psimyn@gmail.com>2017-08-15 09:22:46 +1000
commit2007cca9eff592eeb9fc8af1ac8a57dc751e0295 (patch)
tree7fb40a9fce0c273ecfc9091c58070968bd559870 /changelogs
parent19fb47331417c697e53dd1727b28ed5cbf18ef53 (diff)
downloadgitlab-ce-2007cca9eff592eeb9fc8af1ac8a57dc751e0295.tar.gz
Merge branch 'fix/thread-safe-gpgme-tmp-directory' into 'master'
Fix: Thread safe GPGME tmp directory Closes #35986 See merge request !13481
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/fix-thread-safe-gpgme-tmp-directory.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-thread-safe-gpgme-tmp-directory.yml b/changelogs/unreleased/fix-thread-safe-gpgme-tmp-directory.yml
new file mode 100644
index 00000000000..66b5b6b4f47
--- /dev/null
+++ b/changelogs/unreleased/fix-thread-safe-gpgme-tmp-directory.yml
@@ -0,0 +1,4 @@
+---
+title: Make GPGME temporary directory handling thread safe
+merge_request: 13481
+author: Alexis Reigel