Skip to content
代码片段 群组 项目
提交 b76ad9a6 编辑于 作者: Clayton Cornell's avatar Clayton Cornell
浏览文件

Merge branch 'eread/remove-unneeded-tier-badge' into 'master'

Remove unneeded tier badge and do small edit

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98737



Merged-by: default avatarClayton Cornell <ccornell@gitlab.com>
Approved-by: default avatarDrew Blessing <drew@gitlab.com>
Approved-by: default avatarClayton Cornell <ccornell@gitlab.com>
Co-authored-by: default avatarEvan Read <eread@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -9,7 +9,7 @@ type: reference ...@@ -9,7 +9,7 @@ type: reference
GitLab administrators can configure how passwords and OAuth tokens are stored. GitLab administrators can configure how passwords and OAuth tokens are stored.
## Password storage **(FREE)** ## Password storage
> PBKDF2 and SHA512 [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/360658) in GitLab 15.2 [with flags](../administration/feature_flags.md) named `pbkdf2_password_encryption` and `pbkdf2_password_encryption_write`. Disabled by default. > PBKDF2 and SHA512 [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/360658) in GitLab 15.2 [with flags](../administration/feature_flags.md) named `pbkdf2_password_encryption` and `pbkdf2_password_encryption_write`. Disabled by default.
...@@ -21,8 +21,8 @@ library to hash user passwords. Created password hashes have these attributes: ...@@ -21,8 +21,8 @@ library to hash user passwords. Created password hashes have these attributes:
- **Hashing**: - **Hashing**:
- **BCrypt**: By default, the [`bcrypt`](https://en.wikipedia.org/wiki/Bcrypt) hashing - **BCrypt**: By default, the [`bcrypt`](https://en.wikipedia.org/wiki/Bcrypt) hashing
function is used to generate the hash of the provided password. This is a function is used to generate the hash of the provided password. This cryptographic hashing function is
strong, industry-standard cryptographic hashing function. strong and industry-standard.
- **PBKDF2 and SHA512**: Starting in GitLab 15.2, PBKDF2 and SHA512 are supported - **PBKDF2 and SHA512**: Starting in GitLab 15.2, PBKDF2 and SHA512 are supported
behind the following feature flags (disabled by default): behind the following feature flags (disabled by default):
- `pbkdf2_password_encryption` - Enables reading and comparison of PBKDF2 + SHA512 - `pbkdf2_password_encryption` - Enables reading and comparison of PBKDF2 + SHA512
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册