deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use Rails.root.join where appropriate

Browse source
This commit is contained in:
Robert Speicher 2012-09-26 14:52:01 -04:00
parent 82c3f62603
commit afc4a75499
11 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/gitlab/merge.rb
View file

@ -28,7 +28,7 @@ module Gitlab
def process
Grit::Git.with_timeout(30.seconds) do
lock_file = File.join(Rails.root, "tmp", "merge_repo_#{project.path}.lock")
lock_file = Rails.root.join("tmp", "merge_repo_#{project.path}.lock")
File.open(lock_file, "w+") do |f|
f.flock(File::LOCK_EX)
@ -36,7 +36,7 @@ module Gitlab
unless project.satellite.exists?
raise "You should run: rake gitlab:app:enable_automerge"
end
project.satellite.clear
Dir.chdir(project.satellite.path) do