diff options
author | Rémy Coutable <remy@rymai.me> | 2017-09-13 11:31:37 +0000 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-15 23:05:17 -0500 |
commit | e6022d6ddd336c428d063c220c00800734e352b9 (patch) | |
tree | 51c080d70e2fd362446f72de183ae2dee2d7e967 /app/helpers/branches_helper.rb | |
parent | 03b2c069e56d2957c9d49bd837cecab11f3f96d7 (diff) | |
download | gitlab-ce-e6022d6ddd336c428d063c220c00800734e352b9.tar.gz |
Merge branch 'fix/gpg-tmp-dir-removal-race-condition' into 'master'
Fix: GPG tmp dir removal race condition
Ignore any errors when removing the tmp directory, as we may run into a
race condition:
The `gpg-agent` agent process may clean up some files as well while
`FileUtils.remove_entry` is iterating the directory and removing all its
contained files and directories recursively, which could raise an error.
Closes #36998
See merge request !14194
Diffstat (limited to 'app/helpers/branches_helper.rb')
0 files changed, 0 insertions, 0 deletions