diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /doc/user/admin_area | |
parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'doc/user/admin_area')
-rw-r--r-- | doc/user/admin_area/abuse_reports.md | 2 | ||||
-rw-r--r-- | doc/user/admin_area/broadcast_messages.md | 11 | ||||
-rw-r--r-- | doc/user/admin_area/index.md | 19 | ||||
-rw-r--r-- | doc/user/admin_area/license.md | 7 | ||||
-rw-r--r-- | doc/user/admin_area/monitoring/health_check.md | 26 | ||||
-rw-r--r-- | doc/user/admin_area/settings/account_and_limit_settings.md | 2 | ||||
-rw-r--r-- | doc/user/admin_area/settings/email.md | 5 | ||||
-rw-r--r-- | doc/user/admin_area/settings/external_authorization.md | 7 | ||||
-rw-r--r-- | doc/user/admin_area/settings/index.md | 9 | ||||
-rw-r--r-- | doc/user/admin_area/settings/instance_template_repository.md | 2 | ||||
-rw-r--r-- | doc/user/admin_area/settings/protected_paths.md | 21 | ||||
-rw-r--r-- | doc/user/admin_area/settings/rate_limit_on_issues_creation.md | 2 | ||||
-rw-r--r-- | doc/user/admin_area/settings/sign_up_restrictions.md | 7 | ||||
-rw-r--r-- | doc/user/admin_area/settings/terms.md | 4 | ||||
-rw-r--r-- | doc/user/admin_area/settings/usage_statistics.md | 374 | ||||
-rw-r--r-- | doc/user/admin_area/settings/visibility_and_access_controls.md | 22 |
16 files changed, 72 insertions, 448 deletions
diff --git a/doc/user/admin_area/abuse_reports.md b/doc/user/admin_area/abuse_reports.md index 36de817a29b..77f4a84cf6f 100644 --- a/doc/user/admin_area/abuse_reports.md +++ b/doc/user/admin_area/abuse_reports.md @@ -46,7 +46,7 @@ Blocking a user: The user will be notified with the [following message](https://gitlab.com/gitlab-org/gitlab/blob/master/app/workers/email_receiver_worker.rb#L38): -```text +```plaintext Your account has been blocked. If you believe this is in error, contact a staff member. ``` diff --git a/doc/user/admin_area/broadcast_messages.md b/doc/user/admin_area/broadcast_messages.md index ed03e8a57f3..5427b0c5200 100644 --- a/doc/user/admin_area/broadcast_messages.md +++ b/doc/user/admin_area/broadcast_messages.md @@ -20,10 +20,19 @@ You can style a message's content using the `a` and `br` HTML tags. The `br` tag ## Banners -Banners are shown on the top of a page. +Banners are shown on the top of a page and in Git remote responses. ![Broadcast Message Banner](img/broadcast_messages_banner_v12_10.png) +```bash +$ git push +... +remote: +remote: **Welcome** to GitLab :wave: +remote: +... +``` + ## Notifications Notifications are shown on the bottom right of a page and can contain placeholders. A placeholder is replaced with an attribute of the active user. Placeholders must be surrounded by curly braces, for example `{{name}}`. diff --git a/doc/user/admin_area/index.md b/doc/user/admin_area/index.md index 204573da02d..e63d0c7c882 100644 --- a/doc/user/admin_area/index.md +++ b/doc/user/admin_area/index.md @@ -136,19 +136,22 @@ you must provide the complete email address. #### Users statistics -The **Users statistics** page provides an overview of user accounts by role. Use this information -when validating seat usage of your subscription. +The **Users statistics** page provides an overview of user accounts by role, such as _Users with +highest role Maintainer_. -The page displays subtotals of all users matching criteria such as _Users with highest role -Maintainer_ and _Blocked users_. +The following totals are also included: -The **Total users** is calculated as: **Active users** + **Blocked users**. +- Active users +- Blocked users +- Total users -GitLab billing is based on the number of active users. For details of active users, see +GitLab billing is based on the number of **Active users**, calculated as **Total users** - +**Blocked users**. For details of active users, see [Choosing the number of users](../../subscriptions/index.md#choosing-the-number-of-users). -**Please note** that during the initial stage, the information won't be 100% accurate given that -background processes are still recollecting data. +NOTE: **Note:** +Users statistics are calculated daily, so user changes made since the last update won't be +reflected in the statistics. ### Administering Groups diff --git a/doc/user/admin_area/license.md b/doc/user/admin_area/license.md index fd74b2f311f..59b71b05b16 100644 --- a/doc/user/admin_area/license.md +++ b/doc/user/admin_area/license.md @@ -10,8 +10,8 @@ by **signing into your GitLab instance as an admin** or add it at installation time. The license has the form of a base64 encoded ASCII text with a `.gitlab-license` -extension and can be obtained when you [purchase one][pricing] or when you sign -up for a [free trial]. +extension and can be obtained when you [purchase one](https://about.gitlab.com/pricing/) or when you sign +up for a [free trial](https://about.gitlab.com/free-trial/). NOTE: **Note:** As of GitLab Enterprise Edition 9.4.0, a newly-installed instance without an @@ -104,9 +104,6 @@ expired license(s). It's possible to upload and view more than one license, but only the latest license will be used as the active license. -[free trial]: https://about.gitlab.com/free-trial/ -[pricing]: https://about.gitlab.com/pricing/ - <!-- ## Troubleshooting Include any troubleshooting steps that you can foresee. If you know beforehand what issues diff --git a/doc/user/admin_area/monitoring/health_check.md b/doc/user/admin_area/monitoring/health_check.md index f69584fcb94..91e29118e3e 100644 --- a/doc/user/admin_area/monitoring/health_check.md +++ b/doc/user/admin_area/monitoring/health_check.md @@ -4,8 +4,8 @@ type: concepts, howto # Health Check **(CORE ONLY)** -> - Liveness and readiness probes were [introduced][ce-10416] in GitLab 9.1. -> - The `health_check` endpoint was [introduced][ce-3888] in GitLab 8.8 and was +> - Liveness and readiness probes were [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10416) in GitLab 9.1. +> - The `health_check` endpoint was [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/3888) in GitLab 8.8 and was > deprecated in GitLab 9.1. > - [Access token](#access-token-deprecated) has been deprecated in GitLab 9.4 > in favor of [IP whitelist](#ip-whitelist). @@ -25,15 +25,15 @@ For details, see [how to add IPs to a whitelist for the monitoring endpoints](.. With default whitelist settings, the probes can be accessed from localhost using the following URLs: -```text +```plaintext GET http://localhost/-/health ``` -```text +```plaintext GET http://localhost/-/readiness ``` -```text +```plaintext GET http://localhost/-/liveness ``` @@ -45,7 +45,7 @@ are running. This endpoint circumvents Rails Controllers and is implemented as additional middleware `BasicHealthCheck` very early into the request processing lifecycle. -```text +```plaintext GET /-/health ``` @@ -57,7 +57,7 @@ curl 'https://gitlab.example.com/-/health' Example response: -```text +```plaintext GitLab OK ``` @@ -71,7 +71,7 @@ If the `all=1` parameter is specified, the check will also validate the dependent services (Database, Redis, Gitaly etc.) and gives a status for each. -```text +```plaintext GET /-/readiness GET /-/readiness?all=1 ``` @@ -111,7 +111,7 @@ Checks whether the application server is running. This probe is used to know if Rails Controllers are not deadlocked due to a multi-threading. -```text +```plaintext GET /-/liveness ``` @@ -148,7 +148,7 @@ accepted token can be found under the **Admin Area > Monitoring > Health check** The access token can be passed as a URL parameter: -```text +```plaintext https://gitlab.example.com/-/readiness?token=ACCESS_TOKEN ``` @@ -163,9 +163,3 @@ questions that you know someone might ask. Each scenario can be a third-level heading, e.g. `### Getting error message X`. If you have none to add when creating a doc, leave this section in place but commented out to help encourage others to add to it in the future. --> - -[ce-10416]: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10416 -[ce-3888]: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/3888 -[pingdom]: https://www.pingdom.com -[nagios-health]: https://nagios-plugins.org/doc/man/check_http.html -[newrelic-health]: https://docs.newrelic.com/docs/alerts/alert-policies/downtime-alerts/availability-monitoring diff --git a/doc/user/admin_area/settings/account_and_limit_settings.md b/doc/user/admin_area/settings/account_and_limit_settings.md index f05ef18da8e..83b29597bec 100644 --- a/doc/user/admin_area/settings/account_and_limit_settings.md +++ b/doc/user/admin_area/settings/account_and_limit_settings.md @@ -44,7 +44,7 @@ For instance, consider the following workflow: 1. Your team develops apps which require large files to be stored in the application repository. -1. Although you have enabled [Git LFS](../../../topics/git/lfs/index.md#git-lfs) +1. Although you have enabled [Git LFS](../../../topics/git/lfs/index.md#git-large-file-storage-lfs) to your project, your storage has grown significantly. 1. Before you exceed available storage, you set up a limit of 10 GB per repository. diff --git a/doc/user/admin_area/settings/email.md b/doc/user/admin_area/settings/email.md index 4fab560e081..a99897657ae 100644 --- a/doc/user/admin_area/settings/email.md +++ b/doc/user/admin_area/settings/email.md @@ -12,7 +12,7 @@ The logo in the header of some emails can be customized, see the [logo customiza ## Custom additional text **(PREMIUM ONLY)** -> [Introduced][ee-5031] in [GitLab Premium][eep] 10.7. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5031) in [GitLab Premium](https://about.gitlab.com/pricing/) 10.7. The additional text will appear at the bottom of any email and can be used for legal/auditing/compliance reasons. @@ -22,9 +22,6 @@ legal/auditing/compliance reasons. 1. Enter your text in the **Additional text** field. 1. Click **Save**. -[ee-5031]: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5031 -[eep]: https://about.gitlab.com/pricing/ - ## Custom hostname for private commit emails > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/22560) in GitLab 11.5. diff --git a/doc/user/admin_area/settings/external_authorization.md b/doc/user/admin_area/settings/external_authorization.md index abf3d79b9ed..3a03e46fa1f 100644 --- a/doc/user/admin_area/settings/external_authorization.md +++ b/doc/user/admin_area/settings/external_authorization.md @@ -33,7 +33,7 @@ authorization service. Whenever access is granted or denied this is logged in a logfile called `external-policy-access-control.log`. -Read more about logs GitLab keeps in the [omnibus documentation][omnibus-log-docs]. +Read more about logs GitLab keeps in the [omnibus documentation](https://docs.gitlab.com/omnibus/settings/logs.html). ## Configuration @@ -62,7 +62,7 @@ The available required properties are: When using TLS Authentication with a self signed certificate, the CA certificate needs to be trusted by the openssl installation. When using GitLab installed using Omnibus, learn to install a custom CA in the -[omnibus documentation][omnibus-ssl-docs]. Alternatively learn where to install +[omnibus documentation](https://docs.gitlab.com/omnibus/settings/ssl.html). Alternatively learn where to install custom certificates using `openssl version -d`. ## How it works @@ -127,6 +127,3 @@ questions that you know someone might ask. Each scenario can be a third-level heading, e.g. `### Getting error message X`. If you have none to add when creating a doc, leave this section in place but commented out to help encourage others to add to it in the future. --> - -[omnibus-ssl-docs]: https://docs.gitlab.com/omnibus/settings/ssl.html -[omnibus-log-docs]: https://docs.gitlab.com/omnibus/settings/logs.html diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md index f0e7bf272a7..761d640c535 100644 --- a/doc/user/admin_area/settings/index.md +++ b/doc/user/admin_area/settings/index.md @@ -25,7 +25,7 @@ Access the default page for admin area settings by navigating to | [Terms of Service and Privacy Policy](terms.md) | Include a Terms of Service agreement and Privacy Policy that all users must accept. | | [External Authentication](external_authorization.md#configuration) | External Classification Policy Authorization | | [Web terminal](../../../administration/integration/terminal.md#limiting-websocket-connection-time) | Set max session time for web terminal. | -| [Web IDE](../../project/web_ide/index.md#enabling-client-side-evaluation) | Manage Web IDE Features. | +| [Web IDE](../../project/web_ide/index.md#enabling-live-preview) | Manage Web IDE Features. | ## Integrations @@ -35,7 +35,7 @@ Access the default page for admin area settings by navigating to | [PlantUML](../../../administration/integration/plantuml.md#gitlab) | Allow rendering of PlantUML diagrams in Asciidoc documents. | | [Slack application](../../../user/project/integrations/gitlab_slack_application.md#configuration) **(FREE ONLY)** | Slack integration allows you to interact with GitLab via slash commands in a chat window. This option is only available on GitLab.com, though it may be [available for self-managed instances in the future](https://gitlab.com/gitlab-org/gitlab/-/issues/28164). | | [Third party offers](third_party_offers.md) | Control the display of third party offers. | -| [Snowplow](../../../telemetry/index.md#enabling-tracking) | Configure the Snowplow integration. | +| [Snowplow](../../../development/telemetry/snowplow.md) | Configure the Snowplow integration. | | [Google GKE](../../project/clusters/add_gke_clusters.md) | Google GKE integration allows you to provision GKE clusters from GitLab. | | [Amazon EKS](../../project/clusters/add_eks_clusters.md) | Amazon EKS integration allows you to provision EKS clusters from GitLab. | @@ -44,7 +44,7 @@ Access the default page for admin area settings by navigating to | Option | Description | | ------ | ----------- | | [Repository mirror](visibility_and_access_controls.md#allow-mirrors-to-be-set-up-for-projects) | Configure repository mirroring. | -| [Repository storage](../../../administration/repository_storage_types.md#how-to-migrate-to-hashed-storage) | Configure storage path settings. | +| [Repository storage](../../../administration/repository_storage_types.md) | Configure storage path settings. | | Repository maintenance | ([Repository checks](../../../administration/repository_checks.md) and [Housekeeping](../../../administration/housekeeping.md)). Configure automatic Git checks and housekeeping on repositories. | | [Repository static objects](../../../administration/static_objects_external_storage.md) | Serve repository static objects (for example, archives, blobs, ...) from an external storage (for example, a CDN). | @@ -74,7 +74,6 @@ Access the default page for admin area settings by navigating to | Option | Description | | ------ | ----------- | -| [Metrics - Influx](../../../administration/monitoring/performance/gitlab_configuration.md) | Enable and configure InfluxDB metrics. | | [Metrics - Prometheus](../../../administration/monitoring/prometheus/gitlab_metrics.md) | Enable and configure Prometheus metrics. | | [Metrics - Grafana](../../../administration/monitoring/performance/grafana_configuration.md#integration-with-gitlab-ui) | Enable and configure Grafana. | | [Profiling - Performance bar](../../../administration/monitoring/performance/performance_bar.md#enable-the-performance-bar-via-the-admin-panel) | Enable access to the Performance Bar for a given group. | @@ -103,7 +102,7 @@ Access the default page for admin area settings by navigating to | Option | Description | | ------ | ----------- | | [Email](email.md) | Various email settings. | -| [Help page](../../../customization/help_message.md) | Help page text and support page url. | +| [Help page](../../../customization/help_message.md) | Help page text and support page URL. | | [Pages](../../../administration/pages/index.md#custom-domain-verification) | Size and domain settings for static websites | | [Real-time features](../../../administration/polling.md) | Change this value to influence how frequently the GitLab UI polls for updates. | | [Gitaly timeouts](gitaly_timeouts.md) | Configure Gitaly timeouts. | diff --git a/doc/user/admin_area/settings/instance_template_repository.md b/doc/user/admin_area/settings/instance_template_repository.md index b297d48cb0a..bef4e31259f 100644 --- a/doc/user/admin_area/settings/instance_template_repository.md +++ b/doc/user/admin_area/settings/instance_template_repository.md @@ -40,7 +40,7 @@ are supported: Each template must go in its respective subdirectory, have the correct extension and not be empty. So, the hierarchy should look like this: -```text +```plaintext |-- README.md |-- Dockerfile |-- custom_dockerfile.dockerfile diff --git a/doc/user/admin_area/settings/protected_paths.md b/doc/user/admin_area/settings/protected_paths.md index 56f99d3e725..0cfaf5843d0 100644 --- a/doc/user/admin_area/settings/protected_paths.md +++ b/doc/user/admin_area/settings/protected_paths.md @@ -54,24 +54,3 @@ customized on **Admin > Network > Protected Paths**, along with these options: ![protected-paths](img/protected_paths.png) Requests over the rate limit are logged into `auth.log`. - -## Migrate settings from GitLab 12.3 and earlier - -Omnibus GitLab protected paths throttle is deprecated and is scheduled for removal in -GitLab 13.0. Please see the [GitLab issue](https://gitlab.com/gitlab-org/gitlab/issues/29952) and the [Omnibus GitLab issue](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/4688) for more information. - -NOTE: **Note:** If Omnibus settings are present, applications settings will be automatically ignored to avoid generating multiple requests blocks. - -To migrate from Omnibus GitLab 12.3 and earlier settings: - -1. Customize and enable your protected paths settings by following [Configure using GitLab UI](#configure-using-gitlab-ui) section. - -1. SSH into your frontend nodes and add to `/etc/gitlab/gitlab.rb`: - - ```ruby - gitlab_rails['rack_attack_admin_area_protected_paths_enabled'] = true - ``` - -1. [Reconfigure GitLab](../../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect. - -That's it. Protected paths throttle are now managed by GitLab admin settings. diff --git a/doc/user/admin_area/settings/rate_limit_on_issues_creation.md b/doc/user/admin_area/settings/rate_limit_on_issues_creation.md index 96a20681b2f..dc23865e730 100644 --- a/doc/user/admin_area/settings/rate_limit_on_issues_creation.md +++ b/doc/user/admin_area/settings/rate_limit_on_issues_creation.md @@ -4,7 +4,7 @@ type: reference # Rate limits on issue creation -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/55241) in GitLab 12.10. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28129) in GitLab 12.10. This setting allows you to rate limit the requests to the issue creation endpoint. It defaults to 300 requests per minute. diff --git a/doc/user/admin_area/settings/sign_up_restrictions.md b/doc/user/admin_area/settings/sign_up_restrictions.md index a7a6b0ecefd..8ef5ac8dc8f 100644 --- a/doc/user/admin_area/settings/sign_up_restrictions.md +++ b/doc/user/admin_area/settings/sign_up_restrictions.md @@ -50,14 +50,14 @@ the minimum number of characters a user must have in their password using the Gi ## Whitelist email domains -> [Introduced][ce-598] in GitLab 7.11.0 +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/598) in GitLab 7.11.0 You can restrict users to only sign up using email addresses matching the given domains list. ## Blacklist email domains -> [Introduced][ce-5259] in GitLab 8.10. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5259) in GitLab 8.10. With this feature enabled, you can block email addresses of a specific domain from creating an account on your GitLab server. This is particularly useful @@ -94,6 +94,3 @@ questions that you know someone might ask. Each scenario can be a third-level heading, e.g. `### Getting error message X`. If you have none to add when creating a doc, leave this section in place but commented out to help encourage others to add to it in the future. --> - -[ce-5259]: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5259 -[ce-598]: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/598 diff --git a/doc/user/admin_area/settings/terms.md b/doc/user/admin_area/settings/terms.md index d89381fd810..77c172aa927 100644 --- a/doc/user/admin_area/settings/terms.md +++ b/doc/user/admin_area/settings/terms.md @@ -8,6 +8,8 @@ type: reference An admin can enforce acceptance of a terms of service and privacy policy. When this option is enabled, new and existing users must accept the terms. +If configured, the Terms of Service page can be viewed via `https://your-instance.com/-/users/terms` at anytime. + ## Configuration To enforce acceptance of a Terms of Service and Privacy Policy: @@ -21,7 +23,7 @@ To enforce acceptance of a Terms of Service and Privacy Policy: 1. Click **Save changes**. 1. When you are presented with the **Terms of Service** statement, click **Accept terms**. -![Enable enforcing Terms of Service](img/enforce_terms.png). +![Enable enforcing Terms of Service](img/enforce_terms.png) For each update to the terms, a new version is stored. When a user accepts or declines the terms, GitLab will record which version they accepted or declined. diff --git a/doc/user/admin_area/settings/usage_statistics.md b/doc/user/admin_area/settings/usage_statistics.md index 7869f7de1b6..f3eb094887e 100644 --- a/doc/user/admin_area/settings/usage_statistics.md +++ b/doc/user/admin_area/settings/usage_statistics.md @@ -58,75 +58,7 @@ sequenceDiagram ## Usage Ping **(CORE ONLY)** -> - [Introduced][ee-557] in GitLab Enterprise Edition 8.10. -> - More statistics [were added][ee-735] in GitLab Enterprise Edition 8.12. -> - [Moved to GitLab Core][ce-23361] in 9.1. -> - More statistics [were added][ee-6602] in GitLab Ultimate 11.2. - -GitLab sends a weekly payload containing usage data to GitLab Inc. The usage -ping uses high-level data to help our product, support, and sales teams. It does -not send any project names, usernames, or any other specific data. The -information from the usage ping is not anonymous, it is linked to the hostname -of the instance. - -You can view the exact JSON payload in the administration panel. To view the payload: - -1. Navigate to the **Admin Area > Settings > Metrics and profiling**. -1. Expand the **Usage statistics** section. -1. Click the **Preview payload** button. - -You can see how [the usage ping data maps to different stages of the product](https://gitlab.com/gitlab-data/analytics/blob/master/transform/snowflake-dbt/data/version_usage_stats_to_stage_mappings.csv). - -Usage ping is important to GitLab as we use it to calculate our [Action Monthly Active Users (AMAU)](https://about.gitlab.com/handbook/product/metrics/#action-monthly-active-users-amau) which helps us measure the success of our features. - -### Request flow example - -The following example shows a basic request/response flow between the self-managed GitLab instance, GitLab Version Application, -GitLab License Application and Salesforce: - -```mermaid -sequenceDiagram - participant GitLab instance - participant Version Application - participant License Application - participant Salesforce - GitLab instance->>Version Application: Usage Ping data - loop Process Usage Data - Version Application->>Version Application: Parse Usage Data - Version Application->>Version Application: Record Usage Data - Version Application->>Version Application: Update license ping time - end - Version Application-xLicense Application: Request Zuora subscription id - License Application-xVersion Application: Zuora subscription id - Version Application-xSalesforce: Request Zuora account id by Zuora subscription id - Salesforce-xVersion Application: Zuora account id - Version Application-xSalesforce: Usage data for the Zuora account - Version Application->>GitLab instance: Conversational Development Index -``` - -### Deactivate the usage ping - -The usage ping is opt-out. If you want to deactivate this feature, go to -the Settings page of your administration panel and uncheck the Usage ping -checkbox. - -To disable the usage ping and prevent it from being configured in future through -the administration panel, Omnibus installs can set the following in -[`gitlab.rb`](https://docs.gitlab.com/omnibus/settings/configuration.html#configuration-options): - -```ruby -gitlab_rails['usage_ping_enabled'] = false -``` - -And source installs can set the following in `gitlab.yml`: - -```yaml -production: &base - # ... - gitlab: - # ... - usage_ping_enabled: false -``` +See [Usage Ping guide](../../../development/telemetry/usage_ping.md). ## Instance statistics visibility **(CORE ONLY)** @@ -148,307 +80,3 @@ questions that you know someone might ask. Each scenario can be a third-level heading, e.g. `### Getting error message X`. If you have none to add when creating a doc, leave this section in place but commented out to help encourage others to add to it in the future. --> - -[ee-557]: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557 -[ee-735]: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/735 -[ce-23361]: https://gitlab.com/gitlab-org/gitlab-foss/issues/23361 -[ee-6602]: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/6602 - -## Usage Statistics Collected - -| Statistic | Section | Stage | Description | -|---|---|---|---| -|uuid||| -|hostname||| -|version||| -|installation_type||| -|active_user_count||| -|recorded_at||| -|edition||| -|license_md5||| -|license_id||| -|historical_max_users||| -|Name|licensee|| -|Email|licensee|| -|Company|licensee|| -|license_user_count||| -|license_starts_at||| -|license_expires_at||| -|license_plan||| -|license_trial||| -|assignee_lists|counts|| -|boards|counts|| -|ci_builds|counts|| -|ci_internal_pipelines|counts|| -|ci_external_pipelines|counts|| -|ci_pipeline_config_auto_devops|counts|| -|ci_pipeline_config_repository|counts|| -|ci_runners|counts|| -|ci_triggers|counts|| -|ci_pipeline_schedules|counts|| -|auto_devops_enabled|counts|| -|auto_devops_disabled|counts|| -|deploy_keys|counts|| -|deployments|counts|| -|successful_deployments|counts|| -|failed_deployments|counts|| -|environments|counts|| -|clusters|counts|| -|clusters_enabled|counts|| -|project_clusters_enabled|counts|| -|group_clusters_enabled|counts|| -|instance_clusters_enabled|counts|| -|clusters_disabled|counts|| -|project_clusters_disabled|counts|| -|group_clusters_disabled|counts|| -|instance_clusters_disabled|counts|| -|clusters_platforms_eks|counts|| -|clusters_platforms_gke|counts|| -|clusters_platforms_user|counts|| -|clusters_applications_helm|counts|| -|clusters_applications_ingress|counts|| -|clusters_applications_cert_managers|counts|| -|clusters_applications_crossplane|counts|| -|clusters_applications_prometheus|counts|| -|clusters_applications_runner|counts|| -|clusters_applications_knative|counts|| -|clusters_applications_elastic_stack|counts|| -|clusters_management_project|counts|| -|in_review_folder|counts|| -|grafana_integrated_projects|counts|| -|groups|counts|| -|issues|counts|| -|issues_created_from_gitlab_error_tracking_ui|counts|| -|issues_with_associated_zoom_link|counts|| -|issues_using_zoom_quick_actions|counts|| -|issues_with_embedded_grafana_charts_approx|counts|| -|issues_with_health_status|counts|| -|keys|counts|| -|label_lists|counts|| -|lfs_objects|counts|| -|milestone_lists|counts|| -|milestones|counts|| -|pages_domains|counts|| -|pool_repositories|counts|| -|projects|counts|| -|projects_imported_from_github|counts|| -|projects_with_repositories_enabled|counts|| -|projects_with_error_tracking_enabled|counts|| -|protected_branches|counts|| -|releases|counts|| -|remote_mirrors|counts|| -|snippets|counts|| -|suggestions|counts|| -|todos|counts|| -|uploads|counts|| -|web_hooks|counts|| -|projects_alerts_active|counts|| -|projects_asana_active|counts|| -|projects_assembla_active|counts|| -|projects_bamboo_active|counts|| -|projects_bugzilla_active|counts|| -|projects_buildkite_active|counts|| -|projects_campfire_active|counts|| -|projects_custom_issue_tracker_active|counts|| -|projects_discord_active|counts|| -|projects_drone_ci_active|counts|| -|projects_emails_on_push_active|counts|| -|projects_external_wiki_active|counts|| -|projects_flowdock_active|counts|| -|projects_github_active|counts|| -|projects_hangouts_chat_active|counts|| -|projects_hipchat_active|counts|| -|projects_irker_active|counts|| -|projects_jenkins_active|counts|| -|projects_jenkins_deprecated_active|counts|| -|projects_jira_active -|counts|| -|projects_mattermost_active|counts|| -|projects_mattermost_slash_commands_active|counts|| -|projects_microsoft_teams_active|counts|| -|projects_packagist_active|counts|| -|projects_pipelines_email_active|counts|| -|projects_pivotaltracker_active|counts|| -|projects_prometheus_active|counts|| -|projects_pushover_active|counts|| -|projects_redmine_active|counts|| -|projects_slack_active|counts|| -|projects_slack_slash_commands_active|counts|| -|projects_teamcity_active|counts|| -|projects_unify_circuit_active|counts|| -|projects_youtrack_active|counts|| -|projects_slack_notifications_active|counts|| -|projects_slack_slash_active|counts|| -|projects_jira_server_active|counts|| -|projects_jira_cloud_active|counts|| -|projects_jira_dvcs_cloud_active|counts|| -|projects_jira_dvcs_server_active|counts|| -|labels|counts|| -|merge_requests|counts|| -|notes|counts|| -|wiki_pages_create|counts|| -|wiki_pages_update|counts|| -|wiki_pages_delete|counts|| -|web_ide_commits|counts|| -|web_ide_views|counts|| -|web_ide_merge_requests|counts|| -|web_ide_previews|counts|| -|snippet_comment|counts|| -|commit_comment|counts|| -|merge_request_comment|counts|| -|snippet_create|counts|| -|snippet_update|counts|| -|navbar_searches|counts|| -|cycle_analytics_views|counts|| -|productivity_analytics_views|counts|| -|source_code_pushes|counts|| -|merge_request_create|counts|| -|design_management_designs_create|counts|| -|design_management_designs_update|counts|| -|design_management_designs_delete|counts|| -|licenses_list_views|counts|| -|user_preferences_group_overview_details|counts|| -|user_preferences_group_overview_security_dashboard|counts|| -|ingress_modsecurity_blocking|counts|| -|ingress_modsecurity_disabled|counts|| -|dependency_list_usages_total|counts|| -|epics|counts|| -|feature_flags|counts|| -|geo_nodes|counts|| -|incident_issues|counts|| -|ldap_group_links|counts|| -|ldap_keys|counts|| -|ldap_users|counts|| -|pod_logs_usages_total|counts|| -|projects_enforcing_code_owner_approval|counts|| -|projects_mirrored_with_pipelines_enabled|counts|| -|projects_reporting_ci_cd_back_to_github|counts|| -|projects_with_packages|counts|| -|projects_with_prometheus_alerts|counts|| -|projects_with_tracing_enabled|counts|| -|projects_with_alerts_service_enabled|counts|| -|template_repositories|counts|| -|container_scanning_jobs|counts|| -|dependency_scanning_jobs|counts|| -|license_management_jobs|counts|| -|sast_jobs|counts|| -|status_page_projects|counts|monitor| -|status_page_issues|counts|monitor| -|epics_deepest_relationship_level|counts|| -|operations_dashboard_default_dashboard|counts|| -|operations_dashboard_users_with_projects_added|counts|| -|container_registry_enabled||| -|dependency_proxy_enabled||| -|gitlab_shared_runners_enabled||| -|gravatar_enabled||| -|influxdb_metrics_enabled||| -|ldap_enabled||| -|mattermost_enabled||| -|omniauth_enabled||| -|prometheus_metrics_enabled||| -|reply_by_email_enabled||| -|signup_enabled||| -|web_ide_clientside_preview_enabled||| -|ingress_modsecurity_enabled||| -|elasticsearch_enabled||| -|license_trial_ends_on||| -|geo_enabled||| -|version|Git|| -|version|Gitaly|| -|servers|Gitaly|| -|filesystems|Gitaly|| -|enabled|gitlab_pages|| -|version|gitlab_pages|| -|adapter|database|| -|version|database|| -|average|avg_cycle_analytics - issue|| -|sd|avg_cycle_analytics - issue|| -|missing|avg_cycle_analytics - issue|| -|average|avg_cycle_analytics - plan|| -|sd|avg_cycle_analytics - plan|| -|missing|avg_cycle_analytics - plan|| -|average|avg_cycle_analytics - code|| -|sd|avg_cycle_analytics - code|| -|missing|avg_cycle_analytics - code|| -|average|avg_cycle_analytics - test|| -|sd|avg_cycle_analytics - test|| -|missing|avg_cycle_analytics - test|| -|average|avg_cycle_analytics - review|| -|sd|avg_cycle_analytics - review|| -|missing|avg_cycle_analytics - review|| -|average|avg_cycle_analytics - staging|| -|sd|avg_cycle_analytics - staging|| -|missing|avg_cycle_analytics - staging|| -|average|avg_cycle_analytics - production|| -|sd|avg_cycle_analytics - production|| -|missing|avg_cycle_analytics - production|| -|total|avg_cycle_analytics|| -|clusters_applications_cert_managers|usage_activity_by_stage|configure| -|clusters_applications_helm|usage_activity_by_stage|configure| -|clusters_applications_ingress|usage_activity_by_stage|configure| -|clusters_applications_knative|usage_activity_by_stage|configure| -|clusters_management_project|usage_activity_by_stage|configure| -|clusters_disabled|usage_activity_by_stage|configure| -|clusters_enabled|usage_activity_by_stage|configure| -|clusters_platforms_gke|usage_activity_by_stage|configure| -|clusters_platforms_eks|usage_activity_by_stage|configure| -|clusters_platforms_user|usage_activity_by_stage|configure| -|instance_clusters_disabled|usage_activity_by_stage|configure| -|instance_clusters_enabled|usage_activity_by_stage|configure| -|group_clusters_disabled|usage_activity_by_stage|configure| -|group_clusters_enabled|usage_activity_by_stage|configure| -|project_clusters_disabled|usage_activity_by_stage|configure| -|project_clusters_enabled|usage_activity_by_stage|configure| -|projects_slack_notifications_active|usage_activity_by_stage|configure| -|projects_slack_slash_active|usage_activity_by_stage|configure| -|projects_with_prometheus_alerts: 0|usage_activity_by_stage|configure| -|deploy_keys|usage_activity_by_stage|create| -|keys|usage_activity_by_stage|create| -|merge_requests|usage_activity_by_stage|create| -|projects_enforcing_code_owner_approval|usage_activity_by_stage|create| -|projects_imported_from_github|usage_activity_by_stage|create| -|projects_with_repositories_enabled|usage_activity_by_stage|create| -|protected_branches|usage_activity_by_stage|create| -|remote_mirrors|usage_activity_by_stage|create| -|snippets|usage_activity_by_stage|create| -|suggestions:|usage_activity_by_stage|create| -|groups|usage_activity_by_stage|manage| -|ldap_keys|usage_activity_by_stage|manage| -|ldap_users: 0|usage_activity_by_stage|manage| -|users_created|usage_activity_by_stage|manage| -|clusters|usage_activity_by_stage|monitor| -|clusters_applications_prometheus|usage_activity_by_stage|monitor| -|operations_dashboard_default_dashboard|usage_activity_by_stage|monitor| -|operations_dashboard_users_with_projects_added|usage_activity_by_stage|monitor| -|projects_prometheus_active|usage_activity_by_stage|monitor| -|projects_with_error_tracking_enabled|usage_activity_by_stage|monitor| -|projects_with_tracing_enabled: 0|usage_activity_by_stage|monitor| -|projects_with_packages: 0|usage_activity_by_stage|package| -|assignee_lists|usage_activity_by_stage|plan| -|epics|usage_activity_by_stage|plan| -|issues|usage_activity_by_stage|plan| -|label_lists|usage_activity_by_stage|plan| -|milestone_lists|usage_activity_by_stage|plan| -|notes|usage_activity_by_stage|plan| -|projects|usage_activity_by_stage|plan| -|projects_jira_active|usage_activity_by_stage|plan| -|projects_jira_dvcs_cloud_active|usage_activity_by_stage|plan| -|projects_jira_dvcs_server_active|usage_activity_by_stage|plan| -|service_desk_enabled_projects|usage_activity_by_stage|plan| -|service_desk_issues|usage_activity_by_stage|plan| -|todos: 0|usage_activity_by_stage|plan| -|deployments|usage_activity_by_stage|release| -|failed_deployments|usage_activity_by_stage|release| -|projects_mirrored_with_pipelines_enabled|usage_activity_by_stage|release| -|releases|usage_activity_by_stage|release| -|successful_deployments: 0|usage_activity_by_stage|release| -|user_preferences_group_overview_security_dashboard: 0|usage_activity_by_stage|secure| -|ci_builds|usage_activity_by_stage|verify| -|ci_external_pipelines|usage_activity_by_stage|verify| -|ci_internal_pipelines|usage_activity_by_stage|verify| -|ci_pipeline_config_auto_devops|usage_activity_by_stage|verify| -|ci_pipeline_config_repository|usage_activity_by_stage|verify| -|ci_pipeline_schedules|usage_activity_by_stage|verify| -|ci_pipelines|usage_activity_by_stage|verify| -|ci_triggers|usage_activity_by_stage|verify| -|clusters_applications_runner|usage_activity_by_stage|verify| -|projects_reporting_ci_cd_back_to_github: 0|usage_activity_by_stage|verify| diff --git a/doc/user/admin_area/settings/visibility_and_access_controls.md b/doc/user/admin_area/settings/visibility_and_access_controls.md index f827fed833b..95748f68a55 100644 --- a/doc/user/admin_area/settings/visibility_and_access_controls.md +++ b/doc/user/admin_area/settings/visibility_and_access_controls.md @@ -28,6 +28,21 @@ For more details, see [Protected branches](../../project/protected_branches.md). To change this setting for a specific group, see [Default branch protection for groups](../../group/index.md#changing-the-default-branch-protection-of-a-group) +### Disable group owners from updating default branch protection **(PREMIUM ONLY)** + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/211944) in GitLab 13.0. + +By default, group owners are allowed to override the branch protection set at the global level. + +In [GitLab Premium or higher](https://about.gitlab.com/pricing/), GitLab administrators can disable this privilege of group owners. + +To do this: + +1. Uncheck the **Allow owners to manage default branch protection per group** checkbox. + +NOTE: **Note:** +GitLab administrators can still update the default branch protection of a group. + ## Default project creation protection Project creation protection specifies which roles can create projects. @@ -62,6 +77,13 @@ To change this period: 1. Select the desired option. 1. Click **Save changes**. +### Override default deletion adjourned period + +Alternatively, projects that are marked for removal can be deleted immediately. To do so: + +1. [Restore the project](../../project/settings/#restore-a-project-premium). +1. Delete the project as described in the [Administering Projects page](../../admin_area/#administering-projects). + ## Default project visibility To set the default visibility levels for new projects: |