zeripath 46cac263ca Handle duplicate keys on GPG key ring (#17242) ... It is possible that a keyring can contain duplicate keys on a keyring due to jpegs or other layers. This currently leads to a confusing error for the user - where we report a duplicate key insertion. This PR simply coalesces keys into one key if there are duplicates. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>		2021-10-07 23:10:14 +03:00
..
avatars	Avatar refactor, move avatar code from models to models.avatars, remove duplicated code (#17123)	2021-10-06 01:25:46 +02:00
db	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
fixtures
login	Move twofactor to models/login (#17143)	2021-09-25 15:00:12 +02:00
migrations	Kanban colored boards (#16647)	2021-09-29 22:53:12 +02:00
access.go	Nicely handle missing user in collaborations (#17049)	2021-09-27 19:07:19 +01:00
access_test.go
action.go
action_list.go
action_test.go
admin.go	Fix problem when database ID is not incremented as expected (#17229)	2021-10-06 15:36:24 -05:00
admin_test.go
attachment.go
attachment_test.go
branches.go
branches_test.go
commit.go
commit_status.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
commit_status_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
consistency.go
consistency_test.go
engine_test.go
error.go	Move twofactor to models/login (#17143)	2021-09-25 15:00:12 +02:00
error_oauth2.go
external_login_user.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
fixture_generation.go
fixture_test.go
gpg_key.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
gpg_key_add.go	Handle duplicate keys on GPG key ring (#17242)	2021-10-07 23:10:14 +03:00
gpg_key_commit_verification.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
gpg_key_common.go
gpg_key_import.go
gpg_key_test.go
gpg_key_verify.go
helper.go	Create doctor command to fix repo_units broken by dumps from 1.14.3-1.14.6 (#17136)	2021-09-27 16:55:12 +01:00
helper_directory.go
helper_environment.go
issue.go	Fix problem when database ID is not incremented as expected (#17229)	2021-10-06 15:36:24 -05:00
issue_assignees.go
issue_assignees_test.go
issue_comment.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
issue_comment_list.go
issue_comment_test.go
issue_dependency.go
issue_dependency_test.go
issue_label.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
issue_label_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
issue_list.go
issue_list_test.go
issue_lock.go
issue_milestone.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
issue_milestone_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
issue_reaction.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
issue_reaction_test.go
issue_stopwatch.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
issue_stopwatch_test.go
issue_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
issue_tracked_time.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
issue_tracked_time_test.go
issue_user.go
issue_user_test.go
issue_watch.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
issue_watch_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
issue_xref.go
issue_xref_test.go
lfs.go
lfs_lock.go
main_test.go
migrate.go
notification.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
notification_test.go
org.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
org_team.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
org_team_test.go
org_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
project.go
project_board.go	Kanban colored boards (#16647)	2021-09-29 22:53:12 +02:00
project_issue.go
project_test.go
protected_tag.go
protected_tag_test.go
pull.go	Fix stange behavior of DownloadPullDiffOrPatch in incorect index (#17223)	2021-10-05 16:41:48 +02:00
pull_list.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
pull_sign.go	Move twofactor to models/login (#17143)	2021-09-25 15:00:12 +02:00
pull_test.go	Fix stange behavior of DownloadPullDiffOrPatch in incorect index (#17223)	2021-10-05 16:41:48 +02:00
release.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
repo.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
repo_activity.go
repo_archiver.go
repo_avatar.go
repo_branch.go
repo_collaboration.go	Nicely handle missing user in collaborations (#17049)	2021-09-27 19:07:19 +01:00
repo_collaboration_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
repo_generate.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
repo_generate_test.go
repo_indexer.go
repo_issue.go
repo_language_stats.go
repo_list.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
repo_list_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
repo_mirror.go
repo_permission.go
repo_permission_test.go
repo_pushmirror.go
repo_pushmirror_test.go
repo_redirect.go
repo_redirect_test.go
repo_sign.go	Move twofactor to models/login (#17143)	2021-09-25 15:00:12 +02:00
repo_test.go
repo_transfer.go	Nicely handle missing user in collaborations (#17049)	2021-09-27 19:07:19 +01:00
repo_transfer_test.go
repo_unit.go	Create doctor command to fix repo_units broken by dumps from 1.14.3-1.14.6 (#17136)	2021-09-27 16:55:12 +01:00
repo_watch.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
repo_watch_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
review.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
review_test.go
session.go
ssh_key.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
ssh_key_authorized_keys.go
ssh_key_authorized_principals.go
ssh_key_deploy.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
ssh_key_fingerprint.go
ssh_key_parse.go
ssh_key_principals.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
ssh_key_test.go
star.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
star_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
statistic.go	Add metrics to get issues by repository (#17225)	2021-10-05 20:39:37 +02:00
task.go
token.go	Fix problem when database ID is not incremented as expected (#17229)	2021-10-06 15:36:24 -05:00
token_test.go
topic.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
topic_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
unit.go
update.go
upload.go
user.go	Fix broken Activities link in team dashboard (#17255)	2021-10-07 20:27:38 +02:00
user_avatar.go	Avatar refactor, move avatar code from models to models.avatars, remove duplicated code (#17123)	2021-10-06 01:25:46 +02:00
user_follow.go
user_follow_test.go
user_heatmap.go
user_heatmap_test.go
user_mail.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
user_mail_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
user_openid.go
user_openid_test.go
user_redirect.go
user_redirect_test.go
user_test.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
userlist.go	Move twofactor to models/login (#17143)	2021-09-25 15:00:12 +02:00
userlist_test.go
webhook.go	Move login related structs and functions to models/login (#17093)	2021-09-24 19:32:56 +08:00
webhook_test.go
wiki.go
wiki_test.go