Merge branch 'unicorn-timeout' into 'master'

Increase unicorn timeout

From 30 seconds to 60 seconds

Fixes #1579

See merge request !1110

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"

config/unicorn.rb.example.development

 worker_processes 2
-timeout 30
+timeout 60