Merge branch 'increase-import-timeout' into 'master'

Increase import timeout

Increase import timeout from 2 to 4 minutes. It allows repositories like `gitlabhq` be imported via UI

See merge request !1013
This commit is contained in:
Dmitriy Zaporozhets 2014-08-11 18:38:02 +00:00
commit 43619db515
2 changed files with 2 additions and 2 deletions

View File

@ -25,6 +25,6 @@
.bs-callout.bs-callout-info
This url must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git.
%br
The import will time out after 2 minutes. For big repositories, use a clone/push combination.
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
.form-actions
= f.submit 'Retry import', class: "btn btn-create", tabindex: 4

View File

@ -27,7 +27,7 @@ module Gitlab
# import_repository("gitlab/gitlab-ci", "https://github.com/randx/six.git")
#
def import_repository(name, url)
system "#{gitlab_shell_path}/bin/gitlab-projects", "import-project", "#{name}.git", url
system "#{gitlab_shell_path}/bin/gitlab-projects", "import-project", "#{name}.git", url, '240'
end
# Move repository