summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-11 09:23:53 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-11 09:23:53 +0300
commit9669d33ee8d6a6ff86d00e411d90d079156c6941 (patch)
tree85c617edcff92798cabe4e74158398674544874a
parentaa8c915deb0353e71d9cd61ed40cd41d1093ed6a (diff)
parentd915a239f78afcd1a924c63bd26b954e8d2a2ab1 (diff)
downloadgitlab-ce-9669d33ee8d6a6ff86d00e411d90d079156c6941.tar.gz
Merge pull request #7732 from bbodenmiller/patch-13
Increase import timeout from 2 to 4 minutes
-rw-r--r--app/views/projects/new.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 7efaf5a087b..50a15c15b2a 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -50,7 +50,7 @@
.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.
%hr
.form-group