Add webhook timeout option.

attributes/default.rb

@@ -119,6 +119,8 @@ default['gitlab']['default_projects_features']['wiki'] = true
 default['gitlab']['default_projects_features']['snippets'] = false
 default['gitlab']['default_projects_features']['visibility_level'] = "private"
+default['gitlab']['webhook_timeout'] = 10
+
 # Gems
 default['gitlab']['bundle_install'] = "SSL_CERT_FILE=/opt/local/etc/certs/cacert.pem bundle install --path=.bundle --deployment"

recipes/install.rb

@@ -36,6 +36,7 @@ template File.join(gitlab['path'], 'config', 'gitlab.yml') do
     :google_analytics_id => gitlab['extra']['google_analytics_id'],
     :sign_in_text => gitlab['extra']['sign_in_text'],
     :default_projects_features => gitlab['default_projects_features'],
+    :webhook_timeout => gitlab['webhook_timeout'],
     :gravatar => gitlab['gravatar'],
     :gravatar_plain_url => gitlab['gravatar_plain_url'],
     :gravatar_ssl_url => gitlab['gravatar_ssl_url'],

spec/install_spec.rb

@@ -48,6 +48,7 @@ describe "gitlab::install" do
               "snippets"=>false,
               "visibility_level"=>"private"
               },
+            webhook_timeout: 10,
             gravatar: true,
             gravatar_plain_url: "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon",
             gravatar_ssl_url: "https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon",
@@ -484,6 +485,7 @@ describe "gitlab::install" do
               "snippets"=>false,
               "visibility_level"=>"private"
               },
+            webhook_timeout: 10,
             gravatar: true,
             gravatar_plain_url: "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon",
             gravatar_ssl_url: "https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon",

templates/default/gitlab.yml.erb

@@ -78,6 +78,10 @@ production: &base
       snippets: <%= @default_projects_features['snippets'] %>
       visibility_level: "<%= @default_projects_features['visibility_level'] %>"  # can be "private" | "internal" | "public"
+    ## Webhook settings
+    # Number of seconds to wait for HTTP response after sending webhook HTTP POST request (default: 10)
+    webhook_timeout: <%= @webhook_timeout %>
+
     ## Repository downloads directory
     # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
     # The default is 'tmp/repositories' relative to the root of the Rails app.