diff options
| author | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2019-08-31 10:21:29 +0000 |
|---|---|---|
| committer | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2019-08-31 10:21:29 +0000 |
| commit | 8898ea87bae5b171ec2d22772e3b0d10a2f73975 (patch) | |
| tree | d66514b646191d79f95346886be9481ec0cb2d64 /doc/security/README.md | |
| parent | cc70c6a54aa64425dfa8a3896625b308a83536c3 (diff) | |
| parent | 195ac30514e98b0f97bd191183124f06d1d221fc (diff) | |
| download | gitlab-ce-patch-73-move-storage-shards.tar.gz | |
Merge branch 'master' into 'patch-73-move-storage-shards'patch-73-move-storage-shards
# Conflicts:
# app/models/project.rb
# spec/models/project_spec.rb
Diffstat (limited to 'doc/security/README.md')
| -rw-r--r-- | doc/security/README.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/security/README.md b/doc/security/README.md index 5d498ac7602..fe96f7f2846 100644 --- a/doc/security/README.md +++ b/doc/security/README.md @@ -5,6 +5,7 @@ type: index # Security +- [Password storage](password_storage.md) - [Password length limits](password_length_limits.md) - [Restrict SSH key technologies and minimum length](ssh_keys_restrictions.md) - [Rate limits](rate_limits.md) @@ -17,3 +18,4 @@ type: index - [Enforce Two-factor authentication](two_factor_authentication.md) - [Send email confirmation on sign-up](user_email_confirmation.md) - [Security of running jobs](https://docs.gitlab.com/runner/security/) +- [Proxying images](asset_proxy.md) |