diff options
| author | Brett Walker <brett@digitalmoksha.com> | 2017-09-11 19:12:57 +0200 |
|---|---|---|
| committer | Brett Walker <brett@digitalmoksha.com> | 2017-09-23 15:24:53 +0200 |
| commit | a9b31786971d83c193a1430df7c5c4550ba5aa6b (patch) | |
| tree | f44fc10f5eb558644dfa3e246d88e3b721ebd03d /doc/user/project/repository/gpg_signed_commits | |
| parent | 4457ae827251904c28a30c3db06e05495a42b484 (diff) | |
| download | gitlab-ce-a9b31786971d83c193a1430df7c5c4550ba5aa6b.tar.gz | |
Make GPG signature verification work with non-primary email (#36959)
Diffstat (limited to 'doc/user/project/repository/gpg_signed_commits')
| -rw-r--r-- | doc/user/project/repository/gpg_signed_commits/index.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/repository/gpg_signed_commits/index.md b/doc/user/project/repository/gpg_signed_commits/index.md index dfe43c6b691..d4ef6a58a11 100644 --- a/doc/user/project/repository/gpg_signed_commits/index.md +++ b/doc/user/project/repository/gpg_signed_commits/index.md @@ -26,7 +26,7 @@ to be uploaded to GitLab. For a signature to be verified three conditions need to be met: 1. The public key needs to be added your GitLab account -1. One of the emails in the GPG key matches your **primary** email +1. One of the emails in the GPG key matches a **verified** email address you use in GitLab 1. The committer's email matches the verified email from the gpg key ## Generating a GPG key @@ -94,7 +94,7 @@ started: ``` 1. Enter you real name, the email address to be associated with this key (should - match the primary email address you use in GitLab) and an optional comment + match a verified email address you use in GitLab) and an optional comment (press <kbd>Enter</kbd> to skip): ``` |