summaryrefslogtreecommitdiff
path: root/doc/user/admin_area/settings/visibility_and_access_controls.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-01 03:05:57 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-01 03:05:57 +0000
commitec60358d52be0dc99f52db94dc95209f1486eac9 (patch)
treeae697a01f32bf46443fcdbdefe9873caf62a18b3 /doc/user/admin_area/settings/visibility_and_access_controls.md
parentb38cf7ccdf8b7ca90bce587a1bf4765631733017 (diff)
downloadgitlab-ce-ec60358d52be0dc99f52db94dc95209f1486eac9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/admin_area/settings/visibility_and_access_controls.md')
-rw-r--r--doc/user/admin_area/settings/visibility_and_access_controls.md4
1 files changed, 2 insertions, 2 deletions
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 e07e5f54ada..81e09e4bb8a 100644
--- a/doc/user/admin_area/settings/visibility_and_access_controls.md
+++ b/doc/user/admin_area/settings/visibility_and_access_controls.md
@@ -105,7 +105,7 @@ With GitLab's access restrictions, you can select with which protocols users can
GitLab.
Disabling an access protocol does not block access to the server itself via those ports. The ports
-used for the protocol, SSH or HTTP, will still be accessible. The GitLab restrictions apply at the
+used for the protocol, SSH or HTTP(S), will still be accessible. The GitLab restrictions apply at the
application level.
To specify the enabled Git access protocols:
@@ -150,7 +150,7 @@ For more details, see [SSH key restrictions](../../../security/ssh_keys_restrict
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3586) in GitLab 10.3.
-This option is enabled by default. By disabling it, both pull and push mirroring will no longer
+This option is enabled by default. By disabling it, both [pull and push mirroring](../../../workflow/repository_mirroring.md) will no longer
work in every repository and can only be re-enabled by an admin on a per-project basis.
![Mirror settings](img/mirror_settings.png)