diff options
| author | Wes Gurney <wes_gurney@cable.comcast.com> | 2014-09-12 11:38:14 -0400 |
|---|---|---|
| committer | Wes Gurney <wes_gurney@cable.comcast.com> | 2014-09-12 11:38:14 -0400 |
| commit | 81a70bf5153bb9470e96dde05102afd397528cf0 (patch) | |
| tree | 25ee372e8ac486e01810668414d813e6453b5450 /app | |
| parent | cbb44b9da3e7288200485caed7a9716013e34984 (diff) | |
| download | gitlab-ce-81a70bf5153bb9470e96dde05102afd397528cf0.tar.gz | |
Adding ability to configure webhook timeout via gitlab.yml
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/web_hook.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb index 6cf0c1f683e..752eb8074ac 100644 --- a/app/models/web_hook.rb +++ b/app/models/web_hook.rb @@ -23,7 +23,7 @@ class WebHook < ActiveRecord::Base default_value_for :merge_requests_events, false # 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" } |