Merge branch 'unicorn_timeout' into 'master'

Unicorn timeout increase

Due to changes in d07b2e09fe increased the default unicorn timeout to 1 hour.

Making `Slowpoke.timeout` configurable makes no sense for now as 60s is already high for all requests.

See merge request !297

files/gitlab-config-template/gitlab.rb.template

@@ -209,7 +209,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 ##################
 ## Tweak unicorn settings.
 
-# unicorn['worker_timeout'] = 60
+# unicorn['worker_timeout'] = 3600
 # unicorn['worker_processes'] = 2
 
 ## Advanced settings

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -175,7 +175,7 @@ default['gitlab']['unicorn']['socket'] = '/var/opt/gitlab/gitlab-rails/sockets/g
 default['gitlab']['unicorn']['pidfile'] = '/opt/gitlab/var/unicorn/unicorn.pid'
 default['gitlab']['unicorn']['tcp_nopush'] = true
 default['gitlab']['unicorn']['backlog_socket'] = 1024
-default['gitlab']['unicorn']['worker_timeout'] = 60
+default['gitlab']['unicorn']['worker_timeout'] = 3600
 
 ####
 # Sidekiq