summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-23 17:11:16 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-23 17:11:16 +0300
commitb083ab83ea5c5d63d4cc96f4179e9b7d5fb8f520 (patch)
tree0fe94242b4c8937904e104766ac75537b4a883bc
parente586ee347f7740d2c16018a547fce7d3de9c3eb5 (diff)
downloadgitlab-ce-b083ab83ea5c5d63d4cc96f4179e9b7d5fb8f520.tar.gz
Increase unicorn timeout to 60 seconds
-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