diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-06-08 11:52:51 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-08 11:52:51 +0800 |
commit | b9d611e917d9bd10e0d8be8fc61e057d5936993c (patch) | |
tree | f70159ff5731da4b34312acfff8443dc3be61337 /models/gpg_key.go | |
parent | 21cde5c439676d4aaa15dfc79505f364cc849ec0 (diff) | |
download | gitea-b9d611e917d9bd10e0d8be8fc61e057d5936993c.tar.gz gitea-b9d611e917d9bd10e0d8be8fc61e057d5936993c.zip |
Always store primary email address into email_address table and also the state (#15956)
* Always store primary email address into email_address table and also the state
* Add lower_email to not convert email to lower as what's added
* Fix fixture
* Fix tests
* Use BeforeInsert to save lower email
* Fix v180 migration
* fix tests
* Fix test
* Remove wrong submited codes
* Fix test
* Fix test
* Fix test
* Add test for v181 migration
* remove change user's email to lower
* Revert change on user's email column
* Fix lower email
* Fix test
* Fix test
Diffstat (limited to 'models/gpg_key.go')
-rw-r--r-- | models/gpg_key.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/gpg_key.go b/models/gpg_key.go index 2ffcf47ca7..9530eacb0a 100644 --- a/models/gpg_key.go +++ b/models/gpg_key.go @@ -301,7 +301,7 @@ func parseGPGKey(ownerID int64, e *openpgp.Entity) (*GPGKey, error) { } email := strings.ToLower(strings.TrimSpace(ident.UserId.Email)) for _, e := range userEmails { - if e.Email == email { + if e.LowerEmail == email { emails = append(emails, e) break } |