Commit bbef0ae0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'satellite_chdir' into 'master'

Remove thread-unsafe Dir.chdir from Satellite#lock

See merge request !968
parents 2099aa38 99e1f488
...@@ -20,6 +20,7 @@ v 7.1.0 ...@@ -20,6 +20,7 @@ v 7.1.0
- Show VERSION information on project sidebar - Show VERSION information on project sidebar
- Improve branch removal logic when accept MR - Improve branch removal logic when accept MR
- Fix bug where comment form is spawned inside the Reply button - Fix bug where comment form is spawned inside the Reply button
- Remove Dir.chdir from Satellite#lock for thread-safety
v 7.0.0 v 7.0.0
- The CPU no longer overheats when you hold down the spacebar - The CPU no longer overheats when you hold down the spacebar
......
...@@ -165,7 +165,7 @@ GEM ...@@ -165,7 +165,7 @@ GEM
multi_json multi_json
gitlab-grack (2.0.0.pre) gitlab-grack (2.0.0.pre)
rack (~> 1.5.1) rack (~> 1.5.1)
gitlab-grit (2.6.9) gitlab-grit (2.6.10)
charlock_holmes (~> 0.6) charlock_holmes (~> 0.6)
diff-lcs (~> 1.1) diff-lcs (~> 1.1)
mime-types (~> 1.15) mime-types (~> 1.15)
......
...@@ -53,7 +53,7 @@ module Gitlab ...@@ -53,7 +53,7 @@ module Gitlab
File.open(lock_file, "w+") do |f| File.open(lock_file, "w+") do |f|
begin begin
f.flock File::LOCK_EX f.flock File::LOCK_EX
Dir.chdir(path) { return yield } yield
ensure ensure
f.flock File::LOCK_UN f.flock File::LOCK_UN
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment