diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-07-14 12:15:48 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-07-14 12:16:57 +0200 |
| commit | 99e1f4888a2333b36bba8505001e8e267c44523f (patch) | |
| tree | a5f85309cada3d665877750dd5b78b3e9eaa60f9 /lib | |
| parent | 25c9bf4b6a637c028f29dc36338d4c5ac8c8376c (diff) | |
| download | gitlab-ce-99e1f4888a2333b36bba8505001e8e267c44523f.tar.gz | |
Remove thread-unsafe Dir.chdir from Satellite#lock
This is made possible by changes in gitlab-grit 2.6.10.
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 |