summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2017-10-16 12:40:47 +0300
committerJohn Doe <axil@gitlab.com>2017-12-22 08:44:05 +0100
commit21c0031f789d41ca9d2879585777bc0fe5419c7e (patch)
treee2cf2f67680044498f2d86410291e1ac810e03a3 /doc
parent36f4710301926bb853b35d9b14a60e03b42def34 (diff)
downloadgitlab-ce-21c0031f789d41ca9d2879585777bc0fe5419c7e.tar.gz
Add note about using the term GPG for all related implementationsdocs/gpg-clarify
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/36970
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/repository/gpg_signed_commits/index.md7
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.