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/backend/gitolite_config.rb
View file

@ -10,7 +10,7 @@ module Gitlab
attr_reader :config_tmp_dir, :ga_repo, :conf
def config_tmp_dir
@config_tmp_dir ||= File.join(Rails.root, 'tmp',"gitlabhq-gitolite-#{Time.now.to_i}")
@config_tmp_dir ||= Rails.root.join('tmp',"gitlabhq-gitolite-#{Time.now.to_i}")
end
def ga_repo
@ -19,7 +19,7 @@ module Gitlab
def apply
Timeout::timeout(30) do
File.open(File.join(Rails.root, 'tmp', "gitlabhq-gitolite.lock"), "w+") do |f|
File.open(Rails.root.join('tmp', "gitlabhq-gitolite.lock"), "w+") do |f|
begin
# Set exclusive lock
# to prevent race condition