diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-09-17 07:46:01 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-09-17 07:46:01 +0000 |
| commit | 2e9a7032cec02588484eb162717298d311770c7d (patch) | |
| tree | 8e047cfa969b70946779fd8f7936bfdf1f6758c0 /app | |
| parent | 6cbc20512cd8f062f4a6745b839c5f2921ac6d63 (diff) | |
| parent | ce4defaf2f9195df4680823d8c9f0f49bbced21b (diff) | |
| download | gitlab-ce-2e9a7032cec02588484eb162717298d311770c7d.tar.gz | |
Merge branch 'enable_ssl_by_default' into 'master'
Enable SSL by default
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1135
See merge request !1299
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/hooks/web_hook.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb index 9a8251bdad5..a078accbdbd 100644 --- a/app/models/hooks/web_hook.rb +++ b/app/models/hooks/web_hook.rb @@ -25,7 +25,7 @@ class WebHook < ActiveRecord::Base default_value_for :note_events, false default_value_for :merge_requests_events, false default_value_for :tag_push_events, false - default_value_for :enable_ssl_verification, false + default_value_for :enable_ssl_verification, true # HTTParty timeout default_timeout Gitlab.config.gitlab.webhook_timeout |