Commit ea1eda21 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'unicorn-timeout' into 'master'

Increase unicorn timeout

From 30 seconds to 60 seconds

Fixes #1579

See merge request !1110
parents 2bb7a5bb b083ab83
...@@ -49,7 +49,7 @@ listen "127.0.0.1:8080", :tcp_nopush => true ...@@ -49,7 +49,7 @@ listen "127.0.0.1:8080", :tcp_nopush => true
# #
# For more information see http://stackoverflow.com/a/21682112/752049 # For more information see http://stackoverflow.com/a/21682112/752049
# #
timeout 30 timeout 60
# feel free to point this anywhere accessible on the filesystem # feel free to point this anywhere accessible on the filesystem
pid "/home/git/gitlab/tmp/pids/unicorn.pid" pid "/home/git/gitlab/tmp/pids/unicorn.pid"
......
worker_processes 2 worker_processes 2
timeout 30 timeout 60
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment