summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/unicorn.rb.example2
-rw-r--r--config/unicorn.rb.example.development2
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