diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-14 11:51:26 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-14 11:51:26 +0000 |
| commit | bbef0ae03bc105234495144d369b87b748fd9ca7 (patch) | |
| tree | 87152707dff9a82634860b322e357da901cf8312 /lib | |
| parent | 2099aa38b661f7ceacb1346c1199b9dd89c7dec0 (diff) | |
| parent | 99e1f4888a2333b36bba8505001e8e267c44523f (diff) | |
| download | gitlab-ce-bbef0ae03bc105234495144d369b87b748fd9ca7.tar.gz | |
Merge branch 'satellite_chdir' into 'master'
Remove thread-unsafe Dir.chdir from Satellite#lock
See merge request !968
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/satellite/satellite.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb index 05123ad9c41..7c058b58c4c 100644 --- a/lib/gitlab/satellite/satellite.rb +++ b/lib/gitlab/satellite/satellite.rb @@ -53,7 +53,7 @@ module Gitlab File.open(lock_file, "w+") do |f| begin f.flock File::LOCK_EX - Dir.chdir(path) { return yield } + yield ensure f.flock File::LOCK_UN end |