Move admin application settings to own path
[ci skip]
This commit is contained in:
parent
cbe787c587
commit
7a3b20ed36
9 changed files with 28 additions and 22 deletions
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
## Administrator documentation
|
## Administrator documentation
|
||||||
|
|
||||||
- [Access restrictions](administration/access_restrictions.md) Define which Git access protocols can be used to talk to GitLab
|
- [Access restrictions](user/admin_area/settings/visibility_and_access_controls.md#enabled-git-access-protocols) Define which Git access protocols can be used to talk to GitLab
|
||||||
- [Authentication/Authorization](administration/auth/README.md) Configure
|
- [Authentication/Authorization](administration/auth/README.md) Configure
|
||||||
external authentication with LDAP, SAML, CAS and additional Omniauth providers.
|
external authentication with LDAP, SAML, CAS and additional Omniauth providers.
|
||||||
- [Custom Git hooks](administration/custom_hooks.md) Custom Git hooks (on the filesystem) for when webhooks aren't enough.
|
- [Custom Git hooks](administration/custom_hooks.md) Custom Git hooks (on the filesystem) for when webhooks aren't enough.
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 310 KiB |
Binary file not shown.
Before Width: | Height: | Size: 174 KiB |
Binary file not shown.
Before Width: | Height: | Size: 184 KiB |
BIN
doc/user/admin_area/settings/img/access_restrictions.png
Normal file
BIN
doc/user/admin_area/settings/img/access_restrictions.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.3 KiB |
BIN
doc/user/admin_area/settings/img/domain_blacklist.png
Normal file
BIN
doc/user/admin_area/settings/img/domain_blacklist.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 34 KiB |
BIN
doc/user/admin_area/settings/img/restricted_url.png
Normal file
BIN
doc/user/admin_area/settings/img/restricted_url.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 46 KiB |
22
doc/user/admin_area/settings/sign_up_restrictions.md
Normal file
22
doc/user/admin_area/settings/sign_up_restrictions.md
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
# Sign-up restrictions
|
||||||
|
|
||||||
|
## Blacklist email domains
|
||||||
|
|
||||||
|
> [Introduced][ce-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 to
|
||||||
|
prevent spam. Disposable email addresses are usually used by malicious users to
|
||||||
|
create dummy accounts and spam issues.
|
||||||
|
|
||||||
|
This feature can be activated via the **Application Settings** in the Admin area,
|
||||||
|
and you have the option of entering the list manually, or uploading a file with
|
||||||
|
the list.
|
||||||
|
|
||||||
|
The blacklist accepts wildcards, so you can use `*.test.com` to block every
|
||||||
|
`test.com` subdomain, or `*.io` to block all domains ending in `.io`. Domains
|
||||||
|
should be separated by a whitespace, semicolon, comma, or a new line.
|
||||||
|
|
||||||
|
![Domain Blacklist](img/domain_blacklist.png)
|
||||||
|
|
||||||
|
[ce-5259]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5259
|
|
@ -1,6 +1,8 @@
|
||||||
# Access Restrictions
|
# Visibility and access controls
|
||||||
|
|
||||||
> **Note:** These features are only available on versions 8.10 and above.
|
## Enabled Git access protocols
|
||||||
|
|
||||||
|
> [Introduced][ce-4696] in GitLab 8.10.
|
||||||
|
|
||||||
With GitLab's Access restrictions you can choose which Git access protocols you
|
With GitLab's Access restrictions you can choose which Git access protocols you
|
||||||
want your users to use to communicate with GitLab. This feature can be enabled
|
want your users to use to communicate with GitLab. This feature can be enabled
|
||||||
|
@ -15,8 +17,6 @@ to choose between:
|
||||||
|
|
||||||
![Settings Overview](img/access_restrictions.png)
|
![Settings Overview](img/access_restrictions.png)
|
||||||
|
|
||||||
## Enabled Protocol
|
|
||||||
|
|
||||||
When both SSH and HTTP(S) are enabled, GitLab will behave as usual, it will give
|
When both SSH and HTTP(S) are enabled, GitLab will behave as usual, it will give
|
||||||
your users the option to choose which protocol they would like to use.
|
your users the option to choose which protocol they would like to use.
|
||||||
|
|
||||||
|
@ -37,20 +37,4 @@ not selected.
|
||||||
HTTP, will still be accessible. What GitLab does is restrict access on the
|
HTTP, will still be accessible. What GitLab does is restrict access on the
|
||||||
application level.
|
application level.
|
||||||
|
|
||||||
## Blacklist email domains
|
[ce-4696]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4696
|
||||||
|
|
||||||
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 to
|
|
||||||
prevent spam. Disposable email addresses are usually used by malicious users to
|
|
||||||
create dummy accounts and spam issues.
|
|
||||||
|
|
||||||
This feature can be activated via the `Application Settings` in the Admin area,
|
|
||||||
and you have the option of entering the list manually, or uploading a file with
|
|
||||||
the list.
|
|
||||||
|
|
||||||
The blacklist accepts wildcards, so you can use `*.test.com` to block every
|
|
||||||
`test.com` subdomain, or `*.io` to block all domains ending in `.io`. Domains
|
|
||||||
should be separated by a whitespace, semicolon, comma, or a new line.
|
|
||||||
|
|
||||||
![Domain Blacklist](img/domain_blacklist.png)
|
|
||||||
|
|
Loading…
Reference in a new issue