diff options
| -rw-r--r-- | lib/gitlab_merge.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab_merge.rb b/lib/gitlab_merge.rb index 078f77e12de..1c0923dedd5 100644 --- a/lib/gitlab_merge.rb +++ b/lib/gitlab_merge.rb @@ -25,8 +25,12 @@ class GitlabMerge end def process - Grit::Git.with_timeout(30.seconds) do - File.open(File.join(Rails.root, "tmp", "merge_repo", "#{project.path}.lock"), "w+") do |f| + Grit::Git.with_timeout(30.seconds) do + # Make sure tmp/merge_repo exists + lock_path = File.join(Rails.root, "tmp", "merge_repo") + FileUtils.mkdir_p(lock_path) unless File.exists?(File.join(Rails.root, "tmp", "merge_repo")) + + File.open(File.join(lock_path, "#{project.path}.lock"), "w+") do |f| f.flock(File::LOCK_EX) unless project.satellite.exists? |