diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-05 12:12:30 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-05 12:12:30 +0000 |
| commit | 1fe7a42afca83fbbda638d9569d58a87039cd8f2 (patch) | |
| tree | 507402412502a3faae74ad3be29f31ed2f7da366 /doc | |
| parent | 3594a67d30f26247e0234784c4cea7a238c5e417 (diff) | |
| parent | 782c017ca0c85311373d53d49d3b9af642b6a85d (diff) | |
| download | gitlab-ce-1fe7a42afca83fbbda638d9569d58a87039cd8f2.tar.gz | |
Merge branch 'digitalmoksha/gitlab-ce-feature/verify_secondary_emails' into 'master'
Send a confirmation email when the user adds a secondary email address
Closes #37385, #28621, and #36959
See merge request gitlab-org/gitlab-ce!14703
Diffstat (limited to 'doc')
| -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 29e04a0ccf0..6b9976d133c 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): ``` |