diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 00:09:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 00:09:07 +0300 |
commit | 98f1353fcd07e45ef995c3cee14b659711a63221 (patch) | |
tree | 6b699245b77a76a754d86a343af261560f3bb2d0 /doc | |
parent | b6e611dd423708f2e31c034e5dcab9b0cd18021a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/admin_area/user_cohorts.md | 3 | ||||
-rw-r--r-- | doc/user/project/repository/branches/default.md | 20 |
2 files changed, 1 insertions, 22 deletions
diff --git a/doc/user/admin_area/user_cohorts.md b/doc/user/admin_area/user_cohorts.md index f3c913b409a..888c798be2e 100644 --- a/doc/user/admin_area/user_cohorts.md +++ b/doc/user/admin_area/user_cohorts.md @@ -6,8 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Cohorts **(FREE)** -As a benefit of having the [usage ping active](settings/usage_statistics.md), -you can analyze your users' GitLab activities over time. +You can analyze your users' GitLab activities over time. To see user cohorts, go to **Admin Area > Overview > Users**. diff --git a/doc/user/project/repository/branches/default.md b/doc/user/project/repository/branches/default.md index 1363d883e76..b6446cdc63f 100644 --- a/doc/user/project/repository/branches/default.md +++ b/doc/user/project/repository/branches/default.md @@ -60,7 +60,6 @@ GitLab administrators can configure a new default branch name at the > - It's deployed behind a feature flag, enabled by default. > - It cannot be enabled or disabled per-project. > - It's recommended for production use. -> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-custom-initial-branch-name). GitLab [administrators](../../../permissions.md) of self-managed instances can customize the initial branch for projects hosted on that instance. Individual @@ -75,25 +74,6 @@ Projects created on this instance after you change the setting use the custom branch name, unless a group-level or subgroup-level configuration overrides it. -#### Enable or disable custom initial branch name **(FREE SELF)** - -Setting the default initial branch name is under development but ready for production use. -It is deployed behind a feature flag that is **enabled by default**. -[GitLab administrators with access to the GitLab Rails console](../../../../administration/feature_flags.md) -can opt to disable it for your instance. - -To disable it: - -```ruby -Feature.disable(:global_default_branch_name) -``` - -To enable it: - -```ruby -Feature.enable(:global_default_branch_name) -``` - ### Group-level custom initial branch name **(FREE)** > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/221014) in GitLab 13.6. |