diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-12-22 18:26:58 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-12-22 18:26:58 +0000 |
| commit | 46be07d2c1da93cffd59fb03036e357c04ff6f3b (patch) | |
| tree | 65112e1ac7ff61c97f3a0913103a31bb61bec14f /doc | |
| parent | 255e64ef61b7f1555db1230d099095642e1dcc46 (diff) | |
| parent | 21c0031f789d41ca9d2879585777bc0fe5419c7e (diff) | |
| download | gitlab-ce-46be07d2c1da93cffd59fb03036e357c04ff6f3b.tar.gz | |
Merge branch 'docs/gpg-clarify' into 'master'
Add note about using the term GPG for all related implementations
Closes #36970
See merge request gitlab-org/gitlab-ce!14887
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/project/repository/gpg_signed_commits/index.md | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/user/project/repository/gpg_signed_commits/index.md b/doc/user/project/repository/gpg_signed_commits/index.md index 6b9976d133c..d41be0989d2 100644 --- a/doc/user/project/repository/gpg_signed_commits/index.md +++ b/doc/user/project/repository/gpg_signed_commits/index.md @@ -1,6 +1,11 @@ # Signing commits with GPG -> [Introduced][ce-9546] in GitLab 9.5. +NOTE: **Note:** +The term GPG is used for all OpenPGP/PGP/GPG related material and +implementations. + +> - [Introduced][ce-9546] in GitLab 9.5. +> - Subkeys support was added in GitLab 10.1. GitLab can show whether a commit is verified or not when signed with a GPG key. All you need to do is upload the public GPG key in your profile settings. |