Read about our upcoming Code of Conduct on this issue

Commit bbef0ae0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'satellite_chdir' into 'master'

Remove thread-unsafe Dir.chdir from Satellite#lock

See merge request !968
......@@ -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 @@ def lock
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
......
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