diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-11-21 17:13:21 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-11-21 17:32:37 +0000 |
| commit | afd5911557051c4dae652b386c7a91f746ff18a5 (patch) | |
| tree | 4b6e6e866fb2d15c095fc55c100d5a2a23d88452 /app | |
| parent | 4ebe69600fd7ae9da6fb419d76dd5267d9c3b8ca (diff) | |
| download | gitlab-ce-afd5911557051c4dae652b386c7a91f746ff18a5.tar.gz | |
Set the default gitlab-shell timeout to 3 hours
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/shared/_import_form.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/shared/_import_form.html.haml b/app/views/shared/_import_form.html.haml index 233d8c95eda..736afa085e8 100644 --- a/app/views/shared/_import_form.html.haml +++ b/app/views/shared/_import_form.html.haml @@ -11,6 +11,7 @@ %li If your HTTP repository is not publicly accessible, add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>. %li - The import will time out after 15 minutes. For repositories that take longer, use a clone/push combination. + The import will time out after #{time_interval_in_words(Gitlab.config.gitlab_shell.git_timeout)}. + For repositories that take longer, use a clone/push combination. %li To migrate an SVN repository, check out #{link_to "this document", help_page_path('user/project/import/svn')}. |