diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 09:09:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 09:09:00 +0300 |
commit | a496f41f60e12a0a5c31482b7594ad547e0ade42 (patch) | |
tree | 2248f3ec4451bca9e5fca08c7761c846c5285b7f /doc | |
parent | d393deba773bb1fab09273850fe5d5986066d76d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/instance_limits.md | 22 | ||||
-rw-r--r-- | doc/development/event_tracking/index.md | 4 | ||||
-rw-r--r-- | doc/development/instrumentation.md | 4 | ||||
-rw-r--r-- | doc/user/project/integrations/webhooks.md | 16 |
4 files changed, 37 insertions, 9 deletions
diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md index 6928ea8ec22..f4f70995731 100644 --- a/doc/administration/instance_limits.md +++ b/doc/administration/instance_limits.md @@ -35,13 +35,23 @@ Read more in the [CI documentation](../ci/yaml/README.md#processing-git-pushes). Activity history for projects and individuals' profiles was limited to one year until [GitLab 11.4](https://gitlab.com/gitlab-org/gitlab-foss/issues/52246) when it was extended to two years, and in [GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/issues/33840) to three years. -## Number of project webhooks +## Number of webhooks + +A maximum number of webhooks applies to each GitLab.com tier. Limits apply to project and group webhooks. + +### Project Webhooks > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20730) in GitLab 12.6. -A maximum number of project webhooks applies to each GitLab.com tier. Check the -[Maximum number of webhooks (per tier)](../user/project/integrations/webhooks.md#maximum-number-of-webhooks-per-tier) -section in the Webhooks page. +Check the [Maximum number of project webhooks (per tier)](../user/project/integrations/webhooks.md#maximum-number-of-project-webhooks-per-tier) section in the Webhooks page. + +### Group Webhooks + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25129) in GitLab 12.9. + +Check the [Maximum number of group webhooks (per tier)](../user/project/integrations/webhooks.md#maximum-number-of-group-webhooks-per-tier) section in the Webhooks page. + +### Setting the limit on a self-hosted installation To set this limit on a self-hosted installation, run the following in the [GitLab Rails console](https://docs.gitlab.com/omnibus/maintenance/#starting-a-rails-console-session): @@ -50,7 +60,11 @@ To set this limit on a self-hosted installation, run the following in the # If limits don't exist for the default plan, you can create one with: # Plan.default.create_limits! +# For project webhooks Plan.default.limits.update!(project_hooks: 100) + +# For group webhooks +Plan.default.limits.update!(group_hooks: 100) ``` NOTE: **Note:** Set the limit to `0` to disable it. diff --git a/doc/development/event_tracking/index.md b/doc/development/event_tracking/index.md index 39714cf4af3..10e99e845d6 100644 --- a/doc/development/event_tracking/index.md +++ b/doc/development/event_tracking/index.md @@ -1,4 +1,4 @@ -# Product Analytics +# Event tracking At GitLab, we encourage event tracking so we can iterate on and improve the project and user experience. @@ -44,7 +44,7 @@ From the backend, the events that are tracked will likely consist of things like See [Backend tracking guide](backend.md). -Also, see [Application performance metrics](../instrumentation.md) if you are after instrumenting application performance metrics. +Also, see [Instrumenting Ruby code](../instrumentation.md) if you are instrumenting application performance metrics for Ruby code. ## Enabling tracking diff --git a/doc/development/instrumentation.md b/doc/development/instrumentation.md index 3ce6fda441a..290a3eac758 100644 --- a/doc/development/instrumentation.md +++ b/doc/development/instrumentation.md @@ -1,11 +1,11 @@ -# Application Performance Metrics for Ruby Code +# Instrumenting Ruby code [GitLab Performance Monitoring](../administration/monitoring/performance/index.md) allows instrumenting of both methods and custom blocks of Ruby code. Method instrumentation is the primary form of instrumentation with block-based instrumentation only being used when we want to drill down to specific regions of code within a method. -Please refer to [Product analytics](event_tracking/index.md) if you are after tracking product usage patterns. +Please refer to [Event tracking](event_tracking/index.md) if you are tracking product usage patterns. ## Instrumenting Methods diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md index 202490f2638..0896faa5e9d 100644 --- a/doc/user/project/integrations/webhooks.md +++ b/doc/user/project/integrations/webhooks.md @@ -47,7 +47,7 @@ and **per project and per group** for **GitLab Enterprise Edition**. Navigate to the webhooks page by going to your project's **Settings ➔ Webhooks**. -## Maximum number of webhooks (per tier) +## Maximum number of project webhooks (per tier) > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20730) in GitLab 12.6. @@ -61,6 +61,20 @@ tier](https://about.gitlab.com/pricing/), as shown in the following table: | Silver | 100 | | Gold | 100 | +## Maximum number of group webhooks (per tier) + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25129) in GitLab 12.9. + +A maximum number of group webhooks applies to each [GitLab.com +tier](https://about.gitlab.com/pricing/), as shown in the following table: + +| Tier | Number of webhooks per group | +|----------|--------------------------------| +| Free | feature not available | +| Bronze | 50 | +| Silver | 50 | +| Gold | 50 | + ## Use-cases - You can set up a webhook in GitLab to send a notification to |