Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accept multiple SSH keys in single LDAP SSHPublicKey attribute (#13989) #14607

Merged
merged 1 commit into from
Feb 8, 2021

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Feb 7, 2021

Backport #13989

Fix #13984

Fix #14566

Signed-off-by: Andrew Thornton art27@cantab.net

@zeripath zeripath added this to the 1.13.3 milestone Feb 7, 2021
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Feb 7, 2021
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 8, 2021
@lunny
Copy link
Member

lunny commented Feb 8, 2021

make L-G-T-M work.

@lunny lunny merged commit 82637c2 into go-gitea:release/v1.13 Feb 8, 2021
@zeripath zeripath deleted the backport-13989 branch February 8, 2021 15:53
@zeripath zeripath linked an issue Feb 8, 2021 that may be closed by this pull request
6 tasks
@go-gitea go-gitea locked and limited conversation to collaborators Mar 11, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Different ECDSA keys check as identical during LDAP sync
4 participants