Added support to configure webhook_timeout in gitlab.yaml

app/models/web_hook.rb

@@ -17,7 +17,7 @@ class WebHook < ActiveRecord::Base
   attr_accessible :url
   # HTTParty timeout
-  default_timeout 10
+  default_timeout Gitlab.config.gitlab.webhook_timeout
   validates :url, presence: true,
                   format: { with: URI::regexp(%w(http https)), message: "should be a valid url" }

config/gitlab.yml.example

@@ -58,6 +58,9 @@ production: &base
       wiki: true
       wall: false
       snippets: false
+	  
+    ## Webhook settings
+    # webhook_timeout: 30  # default: 10 - Number of seconds to wait for HTTP response after sending webhook HTTP POST request
   ## External issues trackers
   issues_tracker:

config/initializers/1_settings.rb

@@ -70,6 +70,7 @@ Settings.gitlab['signup_enabled'] ||= false
 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
 Settings.gitlab['issue_closing_pattern'] = '^([Cc]loses|[Ff]ixes) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil?
 Settings.gitlab['default_projects_features'] ||= {}
+Settings.gitlab['webhook_timeout'] ||= 10
 Settings.gitlab.default_projects_features['issues']         = true if Settings.gitlab.default_projects_features['issues'].nil?
 Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil?
 Settings.gitlab.default_projects_features['wiki']           = true if Settings.gitlab.default_projects_features['wiki'].nil?