diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-09 10:41:11 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-09 10:41:11 +0000 |
| commit | ceb342c71648d8055b1dc2c8909a563f82edfcef (patch) | |
| tree | 1f04e40d2c2076ea683e2c8e40678d0f67de4bd1 /CHANGELOG | |
| parent | a5c2e7a486d313b2a3d2f617fcc3c561976aa510 (diff) | |
| parent | 5f38dbc026add6b4afd2d74b4b664d2c63e12222 (diff) | |
| download | gitlab-ce-ceb342c71648d8055b1dc2c8909a563f82edfcef.tar.gz | |
Merge branch 'increase_import_timeout' into 'master'
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
## Import screenshot
See merge request !2717
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index e06d8476d36..9245895bf0c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ v 8.5.0 (unreleased) - Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel) - Fix label links for a merge request pointing to issues list - Don't vendor minified JS + - Increase project import timeout to 15 minutes - Display 404 error on group not found - Track project import failure - Support Two-factor Authentication for LDAP users |