diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/users.md | 2 | ||||
| -rw-r--r-- | doc/ci/triggers/README.md | 7 | ||||
| -rw-r--r-- | doc/user/analytics/productivity_analytics.md | 28 | ||||
| -rw-r--r-- | doc/user/profile/account/delete_account.md | 2 |
4 files changed, 32 insertions, 7 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index 33b6efa7a02..f95ad7b62ba 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -1172,7 +1172,7 @@ Returns: - `404 User Not Found` if user cannot be found. - `403 Forbidden` when trying to deactivate a user: - Blocked by admin or by LDAP synchronization. - - That has any activity in past 14 days. These cannot be deactivated. + - That has any activity in past 180 days. These users cannot be deactivated. ## Activate user diff --git a/doc/ci/triggers/README.md b/doc/ci/triggers/README.md index 82cbd40c4c6..1a58e3eb7a2 100644 --- a/doc/ci/triggers/README.md +++ b/doc/ci/triggers/README.md @@ -32,11 +32,10 @@ to protect trigger tokens. You can use the `CI_JOB_TOKEN` [variable][predef] (used to authenticate with the [GitLab Container Registry][registry]) in the following cases. -#### When used with multi-project pipelines **(PREMIUM)** +#### When used with multi-project pipelines -> **Note**: -The use of `CI_JOB_TOKEN` for multi-project pipelines was [introduced][ee-2017] -in [GitLab Premium][ee] 9.3. +> - Use of `CI_JOB_TOKEN` for multi-project pipelines was [introduced][ee-2017] in [GitLab Premium][ee] 9.3. +> - Use of `CI_JOB_TOKEN` for multi-project pipelines was [made available](https://gitlab.com/gitlab-org/gitlab/issues/31573) in all tiers in GitLab 12.4. This way of triggering can only be used when invoked inside `.gitlab-ci.yml`, and it creates a dependent pipeline relation visible on the diff --git a/doc/user/analytics/productivity_analytics.md b/doc/user/analytics/productivity_analytics.md index 09f83dcff4b..aecbac15c98 100644 --- a/doc/user/analytics/productivity_analytics.md +++ b/doc/user/analytics/productivity_analytics.md @@ -1,6 +1,6 @@ # Productivity Analytics **(PREMIUM)** -> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/12079) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.3 (enabled by default using the feature flags `productivity_analytics`, `productivity_analytics_scatterplot_enabled`). +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/12079) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.3. Track development velocity with Productivity Analytics. @@ -52,3 +52,29 @@ The **Productivity Analytics** dashboard can be accessed only: - On [Premium or Silver tier](https://about.gitlab.com/pricing/) and above. - By users with [Reporter access](../permissions.md) and above. + +## Enabling and disabling using feature flags + +Productivity Analytics is: + +- [Enabled by default](https://gitlab.com/gitlab-org/gitlab/merge_requests/18754) from GitLab 12.4, + but can be disabled using the following feature flags: + - `productivity_analytics`. + - `productivity_analytics_scatterplot_enabled`. +- Disabled by default in GitLab 12.3, but can be enabled using the following feature flag: + - `productivity_analytics`. + +A GitLab administrator can: + +- Disable this feature from GitLab 12.4 by running the follow in a Rails console: + + ```ruby + Feature.disable(:productivity_analytics) + Feature.disable(:productivity_analytics_scatterplot_enabled) + ``` + +- Enable this feature in GitLab 12.3 by running the following in a Rails console: + + ```ruby + Feature.enable(:productivity_analytics) + ``` diff --git a/doc/user/profile/account/delete_account.md b/doc/user/profile/account/delete_account.md index 65896bd19cd..be761ca7558 100644 --- a/doc/user/profile/account/delete_account.md +++ b/doc/user/profile/account/delete_account.md @@ -71,7 +71,7 @@ To do this: Please note that for the deactivation option to be visible to an admin, the user: - Must be currently active. -- Should not have any activity in the last 14 days. +- Should not have any activity in the last 180 days. ### Activating a user |