Merge branch 'webhook_verify_none' into 'master'

Disable SSL peer verification for all webhooks SSL peer verification was silently enabled by the HTTParty upgrade in 8a54fda4. This patch restores the previous behaviour of GitLab 6.3 and earlier.

Merge branch 'webhook_verify_none' into 'master'
206741f0 · Dmitriy Zaporozhets · 4416b57f · 5ae0d61d · 206741f0
Commit 206741f0 authored Jan 16, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

web_hook.rb app/models/web_hook.rb +2 -1

No files found.
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -28,7 +28,7 @@ class WebHook < ActiveRecord::Base
  def execute(data)
    parsed_url = URI.parse(url)
    if parsed_url.userinfo.blank?
-      WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" })
+      WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" }, verify: false)
    else
      post_url = url.gsub("#{parsed_url.userinfo}@", "")
      auth = {
@@ -38,6 +38,7 @@ class WebHook < ActiveRecord::Base
      WebHook.post(post_url,
                   body: data.to_json,
                   headers: {"Content-Type" => "application/json"},
+                   verify: false,
                   basic_auth: auth)
    end
  end