diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-23 15:18:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-23 15:18:05 +0000 |
| commit | ea1eda2124d6910de533bbd9d8fea568e7a3dd8c (patch) | |
| tree | 46485f963d195f5cc8830402a679ad8689db2daf | |
| parent | 2bb7a5bbeab6235661bf6b4c3f352f91151d1927 (diff) | |
| parent | b083ab83ea5c5d63d4cc96f4179e9b7d5fb8f520 (diff) | |
| download | gitlab-ce-ea1eda2124d6910de533bbd9d8fea568e7a3dd8c.tar.gz | |
Merge branch 'unicorn-timeout' into 'master'
Increase unicorn timeout
From 30 seconds to 60 seconds
Fixes #1579
See merge request !1110
| -rw-r--r-- | config/unicorn.rb.example | 2 | ||||
| -rw-r--r-- | config/unicorn.rb.example.development | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index c19a37ed062..6833082d68b 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -49,7 +49,7 @@ listen "127.0.0.1:8080", :tcp_nopush => true # # For more information see http://stackoverflow.com/a/21682112/752049 # -timeout 30 +timeout 60 # feel free to point this anywhere accessible on the filesystem pid "/home/git/gitlab/tmp/pids/unicorn.pid" diff --git a/config/unicorn.rb.example.development b/config/unicorn.rb.example.development index 94a7061451d..3cd00d53a15 100644 --- a/config/unicorn.rb.example.development +++ b/config/unicorn.rb.example.development @@ -1,2 +1,2 @@ worker_processes 2 -timeout 30 +timeout 60 |