Merge branch 'webhooks' into 'master'

documentation on ssl verification in web hooks



See merge request !1386

doc/web_hooks/web_hooks.md

@@ -6,7 +6,15 @@ You can configure web hooks to listen for specific events like pushes, issues or
 
 Web hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
 
-If you send a web hook to an SSL endpoint [the certificate will not be verified](https://gitlab.com/gitlab-org/gitlab-ce/blob/ccd617e58ea71c42b6b073e692447d0fe3c00be6/app/models/web_hook.rb#L35) since many people use self-signed certificates.
+## SSL Verification
+
+By default, the SSL certificate of the webhook endpoint is verified based on 
+an internal list of Certificate Authorities, 
+which means the certificate cannot be self-signed.
+
+You can turn this off in the web hook settings in your GitLab projects.
+
+![SSL Verification](ssl.png)
 
 ## Push events
 
@@ -34,7 +42,7 @@ X-Gitlab-Event: Push Hook
     "name": "Diaspora",
     "url": "git@example.com:mike/diasporadiaspora.git",
     "description": "",
-    "homepage": "http://example.com/mike/diaspora", 
+    "homepage": "http://example.com/mike/diaspora",
     "git_http_url":"http://example.com/mike/diaspora.git",
     "git_ssh_url":"git@example.com:mike/diaspora.git",
     "visibility_level":0
@@ -513,8 +521,8 @@ server.mount_proc '/' do |req, res|
   puts req.body
 end
 
-trap 'INT' do 
-  server.shutdown 
+trap 'INT' do
+  server.shutdown
 end
 server.start
 ```
@@ -529,4 +537,4 @@ When you press 'Test Hook' in GitLab, you should see something like this in the
 {"before":"077a85dd266e6f3573ef7e9ef8ce3343ad659c4e","after":"95cd4a99e93bc4bbabacfa2cd10e6725b1403c60",<SNIP>}
 example.com - - [14/May/2014:07:45:26 EDT] "POST / HTTP/1.1" 200 0
 - -> /
-```
+```
\ No newline at end of file