Skip to content

Revert "Fix delete u2f keys bug (#18042)"#18107

Merged
wxiaoguang merged 2 commits intogo-gitea:release/v1.15from
lunny:lunny/revert_delete_u2f_hint
Dec 26, 2021
Merged

Revert "Fix delete u2f keys bug (#18042)"#18107
wxiaoguang merged 2 commits intogo-gitea:release/v1.15from
lunny:lunny/revert_delete_u2f_hint

Conversation

@lunny
Copy link
Copy Markdown
Member

@lunny lunny commented Dec 26, 2021 •
edited
Loading

This reverts commit 91f5be8. Fix #18096

I will send another PR to fix that bug.

@lunny lunny added the type/bug label Dec 26, 2021
@lunny lunny added this to the 1.15.9 milestone Dec 26, 2021
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Dec 26, 2021
@zeripath
Copy link
Copy Markdown
Contributor

zeripath commented Dec 26, 2021

But I don't understand. This works fine on Chrome and Firefox when you download the binary from Gitea. It's also working for me on codeberg right now.

Is it possible that the people who were having the bug had old cached js?

@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Dec 26, 2021

In footer.tmpl, the JS is loaded by <script src="{{AssetUrlPrefix}}/js/index.js?v={{MD5 AppVer}}"></script>, in most cases a new release will refresh the HTTP cache on client side, the only exception is that some CDN may ignore the dynamic parameters.

ps: I have no idea, either. But I have seen other bug reports for #18096 also, the bug seems not a rare case, likely many users meet it.

@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Dec 26, 2021

Maybe we should use <script src="{{AssetUrlPrefix}}/js/index-{release-hash}.js"></script> instead.

@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 Dec 26, 2021
@zeripath
Copy link
Copy Markdown
Contributor

zeripath commented Dec 26, 2021

Ah I understand what the problem is now - it's not the u2f but everything else!

@wxiaoguang wxiaoguang merged commit a17fce3 into go-gitea:release/v1.15 Dec 26, 2021
@lunny lunny deleted the lunny/revert_delete_u2f_hint branch December 27, 2021 01:34
@zeripath zeripath linked an issue Dec 28, 2021 that may be closed by this pull request
Regression: Fix U2F modal bug - backport introduced issue into 1.15 #18096
Closed
@zeripath zeripath mentioned this pull request Dec 28, 2021
Closed
zeripath added a commit to zeripath/gitea that referenced this pull request Dec 28, 2021
@zeripath
Changelog v1.15.9
6da724b 
* BUGFIXES
  * Revert "Fix delete u2f keys bug (go-gitea#18042)" (go-gitea#18107)
  * Migrating wiki don't require token, so we should move it out of the require form (go-gitea#17645) (go-gitea#18104)
  * Prevent NPE if gitea uploader fails to open url (go-gitea#18080) (go-gitea#18101)
  * Reset locale on login (go-gitea#17734) (go-gitea#18100)
  * Correctly handle failed migrations (go-gitea#17575) (go-gitea#18099)
  * Instead of using routerCtx just escape the url before routing (go-gitea#18086) (go-gitea#18098)
  * Quote references to the user table in consistency checks (go-gitea#18072) (go-gitea#18073)
  * Add NotFound handler (go-gitea#18062) (go-gitea#18067)
  * Ensure that git repository is closed before transfer (go-gitea#18049) (go-gitea#18057)
  * Use common sessioner for API and web routes (go-gitea#18114)
* TRANSLATION
  * Fix code search result hint on zh-CN (go-gitea#18053)

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this pull request Dec 28, 2021
Merged
lunny added a commit that referenced this pull request Dec 30, 2021
@zeripath @lunny
Changelog v1.15.9 (#18115)
3db98be 
* BUGFIXES
  * Revert "Fix delete u2f keys bug (#18042)" (#18107)
  * Migrating wiki don't require token, so we should move it out of the require form (#17645) (#18104)
  * Prevent NPE if gitea uploader fails to open url (#18080) (#18101)
  * Reset locale on login (#17734) (#18100)
  * Correctly handle failed migrations (#17575) (#18099)
  * Instead of using routerCtx just escape the url before routing (#18086) (#18098)
  * Quote references to the user table in consistency checks (#18072) (#18073)
  * Add NotFound handler (#18062) (#18067)
  * Ensure that git repository is closed before transfer (#18049) (#18057)
  * Use common sessioner for API and web routes (#18114)
* TRANSLATION
  * Fix code search result hint on zh-CN (#18053)

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

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

+1 more reviewer

@zeripath zeripath zeripath approved these changes

Reviewers whose approvals may not affect merge requirements

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.15.9

Development

Successfully merging this pull request may close these issues.

Regression: Fix U2F modal bug - backport introduced issue into 1.15

4 participants

@lunny @zeripath @wxiaoguang @GiteaBot