diff options
author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-10-13 15:57:26 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-10-13 15:57:26 +0300 |
commit | 62fa0166a26b0ba765df598f2f8c26f71be99685 (patch) | |
tree | 58c864c92ed5c2747e28dd913cbb208d3689e2a5 | |
parent | bd34ca3c33a56550a1b42b8c150bdba61c96bfbd (diff) | |
download | gitlab-ce-62fa0166a26b0ba765df598f2f8c26f71be99685.tar.gz |
fix gitosis log error
-rw-r--r-- | lib/gitosis.rb | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/gitosis.rb b/lib/gitosis.rb index 54d885011a1..a9eef96cd3f 100644 --- a/lib/gitosis.rb +++ b/lib/gitosis.rb @@ -11,19 +11,21 @@ class Gitosis Dir.mkdir @local_dir - @repo = Git.clone(GITOSIS['admin_uri'], "#{@local_dir}/gitosis") + `git clone #{GITOSIS['admin_uri']} #{@local_dir}/gitosis` end def push - @repo.add('.') - @repo.commit_all "Gitlab" - @repo.push + Dir.chdir(File.join(@local_dir, "gitosis")) + `git add -A` + `git commit -am "Gitlab"` + `git push` + Dir.chdir(Rails.root) - #FileUtils.rm_rf(@local_dir) + FileUtils.rm_rf(@local_dir) end def configure - status = Timeout::timeout(5) do + status = Timeout::timeout(20) do File.open(File.join(Dir.tmpdir,"gitlabhq-gitosis.lock"), "w+") do |f| f.flock(File::LOCK_EX) @@ -39,7 +41,7 @@ class Gitosis end def destroy_project(project) - #FileUtils.rm_rf(project.path_to_repo) + FileUtils.rm_rf(project.path_to_repo) conf = IniFile.new(File.join(@local_dir,'gitosis','gitosis.conf')) |