diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 21:08:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 21:08:01 +0000 |
commit | 95ad46159e4cd93f2b31838199180d824e041994 (patch) | |
tree | d41880d3b6a0093463694978590e590efb08caef /doc/administration | |
parent | 2c72daf2f1744f2b8c8c6674c266907e9ef55558 (diff) | |
download | gitlab-ce-95ad46159e4cd93f2b31838199180d824e041994.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/instance_limits.md | 2 | ||||
-rw-r--r-- | doc/administration/logs.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md index c1ab7730903..e44fc8679ce 100644 --- a/doc/administration/instance_limits.md +++ b/doc/administration/instance_limits.md @@ -196,7 +196,7 @@ than the specified limit, hooks won't be executed. More information can be found in these docs: - [Webhooks push events](../user/project/integrations/webhooks.md#push-events) -- [Project services push hooks limit](../user/project/integrations/project_services.md#push-hooks-limit) +- [Project services push hooks limit](../user/project/integrations/overview.md#push-hooks-limit) ### Activities diff --git a/doc/administration/logs.md b/doc/administration/logs.md index 01774f8d320..5a6eb95de42 100644 --- a/doc/administration/logs.md +++ b/doc/administration/logs.md @@ -228,7 +228,7 @@ This file lives in `/var/log/gitlab/gitlab-rails/integrations_json.log` for Omnibus GitLab packages or in `/home/git/gitlab/log/integrations_json.log` for installations from source. -It contains information about [integrations](../user/project/integrations/project_services.md) activities such as Jira, Asana, and Irker services. It uses JSON format like the example below: +It contains information about [integrations](../user/project/integrations/overview.md) activities such as Jira, Asana, and Irker services. It uses JSON format like the example below: ```json { |