diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-11 18:38:02 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-11 18:38:02 +0000 |
| commit | 43619db5155d29ddaab4c02ed383213f18531d26 (patch) | |
| tree | d1b7d50924f24108f11587d847937305255e8371 | |
| parent | 2c77dae2d7cee9917e9d2664d2f84749ef821e91 (diff) | |
| parent | 4535db04b28996baf118bafeb77acd16065e5c5a (diff) | |
| download | gitlab-ce-43619db5155d29ddaab4c02ed383213f18531d26.tar.gz | |
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
| -rw-r--r-- | app/views/projects/import.html.haml | 2 | ||||
| -rw-r--r-- | lib/gitlab/backend/shell.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/import.html.haml b/app/views/projects/import.html.haml index f883b24fc21..9efb1658c25 100644 --- a/app/views/projects/import.html.haml +++ b/app/views/projects/import.html.haml @@ -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 diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb index b93800e235f..53bff3037e5 100644 --- a/lib/gitlab/backend/shell.rb +++ b/lib/gitlab/backend/shell.rb @@ -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 |