Skip to content

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

Merged
zeripath merged 2 commits into
go-gitea:release/v1.11from
zeripath:backport-9857
Jan 19, 2020
Merged

Ensure that 2fa is checked on reset-password (#9857)#9876
zeripath merged 2 commits into
go-gitea:release/v1.11from
zeripath:backport-9857

Conversation

@zeripath
Copy link
Copy Markdown
Contributor

@zeripath zeripath commented Jan 19, 2020

Backport #9857

  • Ensure that 2fa is checked on reset-password

  • Apply suggestions from code review

Co-Authored-By: Lauris BH lauris@nix.lv

  • Properly manage scratch_code regeneration

Co-authored-by: Lauris BH lauris@nix.lv

* Ensure that 2fa is checked on reset-password

* Apply suggestions from code review

Co-Authored-By: Lauris BH <lauris@nix.lv>

* Properly manage scratch_code regeneration

Co-authored-by: Lauris BH <lauris@nix.lv>
@zeripath zeripath added this to the 1.11.0 milestone Jan 19, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 19, 2020
@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
@zeripath
Copy link
Copy Markdown
Contributor Author

Make lg-tm work

@zeripath zeripath merged commit e878d74 into go-gitea:release/v1.11 Jan 19, 2020
@zeripath zeripath deleted the backport-9857 branch January 19, 2020 23:21
@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.

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.

4 participants