Merge branch 'unicorn-timeout' into 'master'

Increase unicorn timeout From 30 seconds to 60 seconds Fixes #1579 See merge request !1110
2026-08-22 02:56:06 +10:00 · 2014-09-23 15:18:05 +00:00
parent 2bb7a5bbea b083ab83ea
commit ea1eda2124
2 changed files with 2 additions and 2 deletions
@@ -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"
@@ -1,2 +1,2 @@
 worker_processes 2
-timeout 30
+timeout 60