Commit f838b5ae authored by Kati Paizee's avatar Kati Paizee

Merge branch 'docs-move-system-hooks-page' into 'master'

Move system hooks page into admin docs

See merge request gitlab-org/gitlab!83169
parents 2596f952 2577dbca
...@@ -15,12 +15,12 @@ without modifying the GitLab source code. ...@@ -15,12 +15,12 @@ without modifying the GitLab source code.
A file hook runs on each event. You can filter events or projects A file hook runs on each event. You can filter events or projects
in a file hook's code, and create many file hooks as you need. Each file hook is in a file hook's code, and create many file hooks as you need. Each file hook is
triggered by GitLab asynchronously in case of an event. For a list of events triggered by GitLab asynchronously in case of an event. For a list of events
see the [system hooks](../system_hooks/system_hooks.md) documentation. see the [system hooks](system_hooks.md) documentation.
NOTE: NOTE:
File hooks must be configured on the file system of the GitLab server. Only GitLab File hooks must be configured on the file system of the GitLab server. Only GitLab
server administrators can complete these tasks. Explore server administrators can complete these tasks. Explore
[system hooks](../system_hooks/system_hooks.md) or [webhooks](../user/project/integrations/webhooks.md) [system hooks](system_hooks.md) or [webhooks](../user/project/integrations/webhooks.md)
as an option if you do not have file system access. as an option if you do not have file system access.
Instead of writing and supporting your own file hook, you can also make changes Instead of writing and supporting your own file hook, you can also make changes
...@@ -52,7 +52,7 @@ Follow the steps below to set up a custom hook: ...@@ -52,7 +52,7 @@ Follow the steps below to set up a custom hook:
language type. For example, if the script is in Ruby the shebang will language type. For example, if the script is in Ruby the shebang will
probably be `#!/usr/bin/env ruby`. probably be `#!/usr/bin/env ruby`.
1. The data to the file hook is provided as JSON on STDIN. It is exactly the 1. The data to the file hook is provided as JSON on STDIN. It is exactly the
same as for [system hooks](../system_hooks/system_hooks.md). same as for [system hooks](system_hooks.md).
That's it! Assuming the file hook code is properly implemented, the hook fires That's it! Assuming the file hook code is properly implemented, the hook fires
as appropriate. The file hooks file list is updated for each event, there is no as appropriate. The file hooks file list is updated for each event, there is no
......
...@@ -40,7 +40,7 @@ Learn how to install, configure, update, and maintain your GitLab instance. ...@@ -40,7 +40,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
### Configuring GitLab ### Configuring GitLab
- [Adjust your instance's time zone](timezone.md): Customize the default time zone of GitLab. - [Adjust your instance's time zone](timezone.md): Customize the default time zone of GitLab.
- [System hooks](../system_hooks/system_hooks.md): Notifications when users, projects and keys are changed. - [System hooks](system_hooks.md): Notifications when users, projects and keys are changed.
- [Security](../security/index.md): Learn what you can do to further secure your GitLab instance. - [Security](../security/index.md): Learn what you can do to further secure your GitLab instance.
- [Usage statistics, version check, and Service Ping](../user/admin_area/settings/usage_statistics.md): Enable or disable information about your instance to be sent to GitLab, Inc. - [Usage statistics, version check, and Service Ping](../user/admin_area/settings/usage_statistics.md): Enable or disable information about your instance to be sent to GitLab, Inc.
- [Global user settings](user_settings.md): Configure instance-wide user permissions. - [Global user settings](user_settings.md): Configure instance-wide user permissions.
......
This diff is collapsed.
...@@ -13,7 +13,7 @@ You can configure the URL endpoint of the system hooks from the GitLab user inte ...@@ -13,7 +13,7 @@ You can configure the URL endpoint of the system hooks from the GitLab user inte
1. On the top bar, select **Menu > Admin**. 1. On the top bar, select **Menu > Admin**.
1. Select **System Hooks** (`/admin/hooks`). 1. Select **System Hooks** (`/admin/hooks`).
Read more about [system hooks](../system_hooks/system_hooks.md). Read more about [system hooks](../administration/system_hooks.md).
## List system hooks ## List system hooks
......
This diff is collapsed.
...@@ -27,7 +27,7 @@ The Admin Area is made up of the following sections: ...@@ -27,7 +27,7 @@ The Admin Area is made up of the following sections:
| **{overview}** [Overview](#overview-section) | View your GitLab [Dashboard](#admin-area-dashboard), and administer [projects](#administering-projects), [users](#administering-users), [groups](#administering-groups), [topics](#administering-topics), [jobs](#administering-jobs), [runners](#administering-runners), and [Gitaly servers](#administering-gitaly-servers). | | **{overview}** [Overview](#overview-section) | View your GitLab [Dashboard](#admin-area-dashboard), and administer [projects](#administering-projects), [users](#administering-users), [groups](#administering-groups), [topics](#administering-topics), [jobs](#administering-jobs), [runners](#administering-runners), and [Gitaly servers](#administering-gitaly-servers). |
| **{monitor}** Monitoring | View GitLab [system information](#system-information), and information on [background jobs](#background-jobs), [logs](#logs), [health checks](monitoring/health_check.md), [requests profiles](#requests-profiles), and [audit events](#audit-events). | | **{monitor}** Monitoring | View GitLab [system information](#system-information), and information on [background jobs](#background-jobs), [logs](#logs), [health checks](monitoring/health_check.md), [requests profiles](#requests-profiles), and [audit events](#audit-events). |
| **{messages}** Messages | Send and manage [broadcast messages](broadcast_messages.md) for your users. | | **{messages}** Messages | Send and manage [broadcast messages](broadcast_messages.md) for your users. |
| **{hook}** System Hooks | Configure [system hooks](../../system_hooks/system_hooks.md) for many events. | | **{hook}** System Hooks | Configure [system hooks](../../administration/system_hooks.md) for many events. |
| **{applications}** Applications | Create system [OAuth applications](../../integration/oauth_provider.md) for integrations with other services. | | **{applications}** Applications | Create system [OAuth applications](../../integration/oauth_provider.md) for integrations with other services. |
| **{slight-frown}** Abuse Reports | Manage [abuse reports](review_abuse_reports.md) submitted by your users. | | **{slight-frown}** Abuse Reports | Manage [abuse reports](review_abuse_reports.md) submitted by your users. |
| **{license}** License | Add, display, and remove [licenses](license.md). | | **{license}** License | Add, display, and remove [licenses](license.md). |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment