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

Fix Account linking page #33325

Merged
merged 7 commits into from
Jan 19, 2025
Merged

Fix Account linking page #33325

merged 7 commits into from
Jan 19, 2025

Conversation

CrimsonEdgeHope
Copy link
Contributor

@CrimsonEdgeHope CrimsonEdgeHope commented Jan 19, 2025

Fix password form missing whilst linking account even with ENABLE_PASSWORD_SIGNIN_FORM = true.

Remove redundant empty box in account linking sign up page when LinkAccountMode is true.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 19, 2025
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 19, 2025
@CrimsonEdgeHope
Copy link
Contributor Author

We run a Gitea in our infrastructure. Since upgrade to 1.23, we found the account linking page broken. We verified backend configuration and found nowhere wrong. No custom template modification made either. I believe it's a bug as everything in account linking was fine in 1.22.

@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files labels Jan 19, 2025
@CrimsonEdgeHope
Copy link
Contributor Author

Before:

b41

b42

After:

af1

af2

@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, 2025
@wxiaoguang wxiaoguang added backport/v1.23 This PR should be backported to Gitea 1.23 type/bug labels Jan 19, 2025
@wxiaoguang
Copy link
Contributor

wxiaoguang commented Jan 19, 2025

This PR is from an org, so maintainers can't edit it. I think there are still some UI problems .... maybe they could be fixed later. Or would you like to create a PR from your personal account? Or maybe I can create a PR based on yours?

@CrimsonEdgeHope
Copy link
Contributor Author

Hi @wxiaoguang ! It should be editable by now. Could you elaborate further on UI issue?

@wxiaoguang
Copy link
Contributor

Hi @wxiaoguang ! It should be editable by now. Could you elaborate further on UI issue?

I will make some more fixes and try to add a test for the "link account" page.

@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 19, 2025
@wxiaoguang
Copy link
Contributor

wxiaoguang commented Jan 19, 2025

Fixed UI:

image


image


image

@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 19, 2025
@wxiaoguang
Copy link
Contributor

wxiaoguang commented Jan 19, 2025

And added some tests in dd3a94c, to make sure it won't break again.


To make backport easier, many legacy code are kept as-is.

@wxiaoguang wxiaoguang added this to the 1.24.0 milestone Jan 19, 2025
@GiteaBot GiteaBot removed the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 19, 2025
@GiteaBot GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Jan 19, 2025
@wxiaoguang wxiaoguang merged commit 1928918 into go-gitea:main Jan 19, 2025
26 checks passed
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jan 19, 2025
Fix password form missing whilst linking account even with
`ENABLE_PASSWORD_SIGNIN_FORM = true`.

Remove redundant empty box in account linking sign up page when
`LinkAccountMode` is true.

---------

Co-authored-by: wxiaoguang <[email protected]>
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Jan 19, 2025
wxiaoguang added a commit that referenced this pull request Jan 19, 2025
Backport #33325 by CrimsonEdgeHope

Fix password form missing whilst linking account even with
`ENABLE_PASSWORD_SIGNIN_FORM = true`.

Remove redundant empty box in account linking sign up page when
`LinkAccountMode` is true.

Co-authored-by: CrimsonEdgeHope <[email protected]>
Co-authored-by: wxiaoguang <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jan 20, 2025
* giteaofficial/main:
  [skip ci] Updated licenses and gitignores
  Fix typo in documentation of GetBranchNames() (go-gitea#33330)
  Fix Account linking page (go-gitea#33325)
  Fix parentCommit invalid memory address or nil pointer dereference. (go-gitea#33204)
  Make tracked time representation display as hours (go-gitea#33315)
  [skip ci] Updated translations via Crowdin
  [skip ci] Updated translations via Crowdin
  Fix push message behavior (go-gitea#33215)
  Add golang back to nix dev environment and pin v1.23 (go-gitea#33275)
  Trivial fixes (go-gitea#33304)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/done All backports for this PR have been created backport/v1.23 This PR should be backported to Gitea 1.23 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants