diff options
| author | Zevs <vsv2711@gmail.com> | 2012-06-04 21:41:26 +0300 |
|---|---|---|
| committer | Zevs <vsv2711@gmail.com> | 2012-06-04 21:41:26 +0300 |
| commit | 3ffb9cbfa930d3105560dbf86cd39d301feb1170 (patch) | |
| tree | fd6d7413dc99ad00466717c766cd24d7d22f6b8a /lib | |
| parent | a0db028c1b2fdc2a96ae5eba4d9c9180f57434d6 (diff) | |
| download | gitlab-ce-3ffb9cbfa930d3105560dbf86cd39d301feb1170.tar.gz | |
Task#879 Relocated gitolite repo and lock file
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gitolite.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/gitolite.rb b/lib/gitlab/gitolite.rb index c7b407ddf23..efb89165b47 100644 --- a/lib/gitlab/gitolite.rb +++ b/lib/gitlab/gitolite.rb @@ -16,7 +16,7 @@ module Gitlab def pull # create tmp dir - @local_dir = File.join(Dir.tmpdir,"gitlabhq-gitolite-#{Time.now.to_i}") + @local_dir = File.join(Rails.root, 'tmp',"gitlabhq-gitolite-#{Time.now.to_i}") Dir.mkdir @local_dir `git clone #{GitHost.admin_uri} #{@local_dir}/gitolite` @@ -33,8 +33,8 @@ module Gitlab end def configure - status = Timeout::timeout(20) do - File.open(File.join(Dir.tmpdir,"gitlabhq-gitolite.lock"), "w+") do |f| + Timeout::timeout(20) do + File.open(File.join(Rails.root, 'tmp', "gitlabhq-gitolite.lock"), "w+") do |f| begin f.flock(File::LOCK_EX) pull |