diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-07-02 21:59:48 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-07-02 21:59:48 +0300 |
| commit | 1d543e64300666e2abc5cc8562e6b55458878801 (patch) | |
| tree | 84ba2564b6ba27dbb6c6649cf142c2848059582f /lib | |
| parent | 9b337b8328a65c5e692c90ba1f817184bd054257 (diff) | |
| download | gitlab-ce-1d543e64300666e2abc5cc8562e6b55458878801.tar.gz | |
Finished with configs
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gitolite.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/status.rake | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/gitolite.rb b/lib/gitlab/gitolite.rb index efb89165b47..7b80d4a836a 100644 --- a/lib/gitlab/gitolite.rb +++ b/lib/gitlab/gitolite.rb @@ -33,7 +33,7 @@ module Gitlab end def configure - Timeout::timeout(20) do + Timeout::timeout(30) do File.open(File.join(Rails.root, 'tmp', "gitlabhq-gitolite.lock"), "w+") do |f| begin f.flock(File::LOCK_EX) diff --git a/lib/tasks/gitlab/status.rake b/lib/tasks/gitlab/status.rake index 7db5657467c..ac712234b27 100644 --- a/lib/tasks/gitlab/status.rake +++ b/lib/tasks/gitlab/status.rake @@ -21,7 +21,6 @@ namespace :gitlab do return end - GIT_HOST = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git_host"] print "#{git_base_path}............" if File.exists?(git_base_path) puts "exists".green |