summaryrefslogtreecommitdiff
path: root/doc/web_hooks
diff options
context:
space:
mode:
authorJob van der Voort <jobvandervoort@gmail.com>2015-09-22 11:00:11 +0200
committerJob van der Voort <jobvandervoort@gmail.com>2015-09-22 11:00:11 +0200
commit8be6c74ac3e44141df2c3380ca2ce6ebaba137be (patch)
tree8bb5de3b660573a79f1b9e9abbe70952ea024bb1 /doc/web_hooks
parent8ae026a6e64846d720184dbdee30d274a4e8ca24 (diff)
downloadgitlab-ce-8be6c74ac3e44141df2c3380ca2ce6ebaba137be.tar.gz
documentation on ssl verification in web hooks
Diffstat (limited to 'doc/web_hooks')
-rw-r--r--doc/web_hooks/ssl.pngbin0 -> 77165 bytes
-rw-r--r--doc/web_hooks/web_hooks.md13
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/web_hooks/ssl.png b/doc/web_hooks/ssl.png
new file mode 100644
index 00000000000..698f1a0f64a
--- /dev/null
+++ b/doc/web_hooks/ssl.png
Binary files differ
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index f4701bb6db2..a0280e1c735 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -6,7 +6,12 @@ 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
+
+Web hooks do SSL verification by default.
+You can turn this off in the web hook settings in your GitLab projects.
+
+![SSL Verification](ssl.png)
## Push events
@@ -34,7 +39,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 +518,8 @@ server.mount_proc '/' do |req, res|
puts req.body
end
-trap 'INT' do
- server.shutdown
+trap 'INT' do
+ server.shutdown
end
server.start
```