Merge branch 'satellite_chdir' into 'master'

Remove thread-unsafe Dir.chdir from Satellite#lock

See merge request !968

CHANGELOG

@@ -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

Gemfile.lock

@@ -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)

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