diff options
| author | James Lopez <james@jameslopez.es> | 2017-02-13 18:43:17 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-02-16 12:02:26 +0300 |
| commit | b3fb5b4f26b609ad41ccb0837e599fa50c22b55f (patch) | |
| tree | 1ec8e4696ffe1f0c8b654005db9ea03d977e2481 /lib/gitlab/shell.rb | |
| parent | 01dfedbcad2b8c0988036f9083642a51ee4e9268 (diff) | |
Use gitlab shell import instead of manually creating the webhooks
Also update repo restorer to use project wiki method.
Diffstat (limited to 'lib/gitlab/shell.rb')
| -rw-r--r-- | lib/gitlab/shell.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb index 82e194c1af1..ea7e6a8c93d 100644 --- a/lib/gitlab/shell.rb +++ b/lib/gitlab/shell.rb @@ -80,8 +80,10 @@ module Gitlab # import_repository("/path/to/storage", "gitlab/gitlab-ci", "https://github.com/randx/six.git") # def import_repository(storage, name, url) + # Timeout should be less than 900 ideally, to prevent the memory killer + # to silently kill the process without knowing we are timing out here. output, status = Popen::popen([gitlab_shell_projects_path, 'import-project', - storage, "#{name}.git", url, '900']) + storage, "#{name}.git", url, '800']) raise Error, output unless status.zero? true end |