diff options
| author | Drew Blessing <drew@gitlab.com> | 2016-02-04 13:40:42 -0600 |
|---|---|---|
| committer | Drew Blessing <drew@gitlab.com> | 2016-02-04 13:41:42 -0600 |
| commit | 5f38dbc026add6b4afd2d74b4b664d2c63e12222 (patch) | |
| tree | 2181ee047efd15ebafe3dd5bd159ab12eecf9612 /lib | |
| parent | 3720b98e1bdea5901817dd7a58df532bd5e75077 (diff) | |
| download | gitlab-ce-5f38dbc026add6b4afd2d74b4b664d2c63e12222.tar.gz | |
Increase project import timeout from 4 minutes to 15 minutes
Many users were experiencing timeouts when we only allowed
4 minutes before a timeout. A 15 minute timeout is more
than reasonable and prevents us from having to add a
configuration for this.
Fixes gitlab-org/gitlab-ee#246
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/backend/shell.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb index f751458ac66..b9bb6e76081 100644 --- a/lib/gitlab/backend/shell.rb +++ b/lib/gitlab/backend/shell.rb @@ -36,7 +36,7 @@ module Gitlab # import_repository("gitlab/gitlab-ci", "https://github.com/randx/six.git") # def import_repository(name, url) - output, status = Popen::popen([gitlab_shell_projects_path, 'import-project', "#{name}.git", url, '240']) + output, status = Popen::popen([gitlab_shell_projects_path, 'import-project', "#{name}.git", url, '900']) raise Error, output unless status.zero? true end |