summaryrefslogtreecommitdiff
path: root/doc/administration/custom_hooks.md
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-07-11 17:19:17 -0400
committerJacob Schatz <jschatz1@gmail.com>2016-07-11 17:19:17 -0400
commit0452e0a57e24fdd65f559cc1a8629892714adc7a (patch)
treebf33ca472a3d434770783d80b5d10211383e706c /doc/administration/custom_hooks.md
parent7690513495d02d14af8a1a0cb3bf00f243ec0419 (diff)
parentf76596380fb545c54b14c6bfc339a68a1dc162d3 (diff)
downloadgitlab-ce-faster-diffs.tar.gz
Merge branch 'master' into faster-diffsfaster-diffs
Diffstat (limited to 'doc/administration/custom_hooks.md')
-rw-r--r--doc/administration/custom_hooks.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/administration/custom_hooks.md b/doc/administration/custom_hooks.md
index 9fd7b71d2dc..e3306c22d3f 100644
--- a/doc/administration/custom_hooks.md
+++ b/doc/administration/custom_hooks.md
@@ -48,7 +48,8 @@ as appropriate.
This feature was [introduced][5073] in GitLab 8.10.
If the commit is declined or an error occurs during the Git hook check,
-the STDERR and/or SDOUT message of the hook will be present in GitLab's UI.
+the STDERR or STDOUT message of the hook will be present in GitLab's UI.
+STDERR takes precedence over STDOUT.
![Custom message from custom Git hook](img/custom_hooks_error_msg.png)