From 99e1f4888a2333b36bba8505001e8e267c44523f Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 14 Jul 2014 12:15:48 +0200
Subject: [PATCH] Remove thread-unsafe Dir.chdir from Satellite#lock
This is made possible by changes in gitlab-grit 2.6.10.
---
CHANGELOG | 1 +
Gemfile.lock | 2 +-
lib/gitlab/satellite/satellite.rb | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index f6843aaa6a9..4ddb2c2ea7d 100644
--- a/CHANGELOG
+++ b/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
diff --git a/Gemfile.lock b/Gemfile.lock
index 97d3d8bab64..8e48eb9fe72 100644
--- a/Gemfile.lock
+++ b/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)
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
--
GitLab