Skip to content

Ensure that 2fa is checked on reset-password (#9857) #9877

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jan 19, 2020
Merged

Ensure that 2fa is checked on reset-password (#9857) #9877

merged 1 commit into from
Jan 19, 2020

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Jan 19, 2020 •
edited
Loading

Backport #9857

  • Ensure that 2fa is checked on reset-password

  • Apply suggestions from code review

Co-Authored-By: Lauris BH [email protected]

  • Properly manage scratch_code regeneration

Co-authored-by: Lauris BH [email protected]

@zeripath @lafriks
Ensure that 2fa is checked on reset-password (go-gitea#9857)
4bb926d 
* Ensure that 2fa is checked on reset-password

* Apply suggestions from code review

Co-Authored-By: Lauris BH <[email protected]>

* Properly manage scratch_code regeneration

Co-authored-by: Lauris BH <[email protected]>
@zeripath zeripath added this to the 1.10.3 milestone Jan 19, 2020
@jolheiser
Copy link
Member

This will need milestone 1.10.4

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 19, 2020
@zeripath zeripath modified the milestones: 1.10.3, 1.10.4 Jan 19, 2020
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 19, 2020
@zeripath
Copy link
Contributor Author

make lg-tm work

@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 Jan 19, 2020
@techknowlogick techknowlogick merged commit e3e0248 into go-gitea:release/v1.10 Jan 19, 2020
@zeripath zeripath deleted the backport-9857-1.10 branch January 20, 2020 07:10
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@guillep2k guillep2k guillep2k approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.10.4
Development

Successfully merging this pull request may close these issues.
5 participants
@zeripath @jolheiser @techknowlogick @guillep2k @GiteaBot