Remove thread-unsafe Dir.chdir from Satellite#lock
This is made possible by changes in gitlab-grit 2.6.10.
This commit is contained in:
parent
25c9bf4b6a
commit
99e1f4888a
3 changed files with 3 additions and 2 deletions
|
@ -20,6 +20,7 @@ v 7.1.0
|
|||
- Show VERSION information on project sidebar
|
||||
- Improve branch removal logic when accept MR
|
||||
- Fix bug where comment form is spawned inside the Reply button
|
||||
- Remove Dir.chdir from Satellite#lock for thread-safety
|
||||
|
||||
v 7.0.0
|
||||
- The CPU no longer overheats when you hold down the spacebar
|
||||
|
|
|
@ -165,7 +165,7 @@ GEM
|
|||
multi_json
|
||||
gitlab-grack (2.0.0.pre)
|
||||
rack (~> 1.5.1)
|
||||
gitlab-grit (2.6.9)
|
||||
gitlab-grit (2.6.10)
|
||||
charlock_holmes (~> 0.6)
|
||||
diff-lcs (~> 1.1)
|
||||
mime-types (~> 1.15)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue