diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 03:08:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 03:08:55 +0000 |
| commit | 500626a5c953ad81cfc3ed74bf0148c075617e58 (patch) | |
| tree | 554e385e0e548f15fc90388da8b73622b803d6f3 /doc/user/admin_area/settings | |
| parent | b133cb2468b412683dbc5f19492d98b2ffa47d09 (diff) | |
| download | gitlab-ce-500626a5c953ad81cfc3ed74bf0148c075617e58.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/admin_area/settings')
| -rw-r--r-- | doc/user/admin_area/settings/usage_statistics.md | 2 | ||||
| -rw-r--r-- | doc/user/admin_area/settings/visibility_and_access_controls.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/admin_area/settings/usage_statistics.md b/doc/user/admin_area/settings/usage_statistics.md index 0841daefde3..52b92c98482 100644 --- a/doc/user/admin_area/settings/usage_statistics.md +++ b/doc/user/admin_area/settings/usage_statistics.md @@ -30,7 +30,7 @@ This information is used, among other things, to identify to which versions patches will need to be backported, making sure active GitLab instances remain secure. -If you disable version check, this information will not be collected. Enable or +If you disable version check, this information will not be collected. Enable or disable the version check in **Admin Area > Settings > Metrics and profiling > Usage statistics**. ### Request flow example 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 1e67ac88467..8f64e9207b5 100644 --- a/doc/user/admin_area/settings/visibility_and_access_controls.md +++ b/doc/user/admin_area/settings/visibility_and_access_controls.md @@ -15,7 +15,7 @@ To access the visibility and access control options: ## Default branch protection This global option defines the branch protection that applies to every repository's default branch. [Branch protection](../../project/protected_branches.md) specifies which roles can push to branches and which roles can delete -branches. In this case _Default_ refers to a repository's default branch, which in most cases is _master_. +branches. In this case _Default_ refers to a repository's default branch, which in most cases is _master_. This setting applies only to each repositories' default branch. To protect other branches, you must configure branch protection in repository. For details, see [Protected Branches](../../project/protected_branches.md). |