Avoid cycle-redirecting user/login page #28636

wxiaoguang · 2023-12-28T15:02:36Z

Fix #28231, and remove some unused code. The db.HasEngine doesn't seem useful because the db engine is always initialized before web route.

GiteaBot · 2023-12-30T08:48:39Z

I was unable to create a backport for 1.21. @wxiaoguang, please send one manually. 🍵

go run ./contrib/backport 28636
...  // fix git conflicts if any
go run ./contrib/backport --continue

Backport #28636 Fix #28231, and remove some unused code.

* giteaofficial/main: Add global setting how timestamps should be rendered (go-gitea#28657) [skip ci] Updated translations via Crowdin Upgrade xorm to new version which supported update join for all supported databases (go-gitea#28590) Fix: system webhooks API bug (go-gitea#28531) Fix alpine package files are not rebuilt (go-gitea#28638) Fix migration test (go-gitea#28659) Avoid cycle-redirecting user/login page (go-gitea#28636) Fix long package version names overflowing (go-gitea#28619)

This PR contains the following updates: | Package | Update | Change | |---|---|---| | [docker.io/gitea/gitea](https://github.com/go-gitea/gitea) | patch | `1.21.3` -> `1.21.4` | --- ### Release Notes <details> <summary>go-gitea/gitea (docker.io/gitea/gitea)</summary> ### [`v1.21.4`](https://github.com/go-gitea/gitea/releases/tag/v1.21.4) [Compare Source](go-gitea/gitea@v1.21.3...v1.21.4) - SECURITY - Update github.com/cloudflare/circl ([#28789](go-gitea/gitea#28789)) ([#28790](go-gitea/gitea#28790)) - Require token for GET subscription endpoint ([#28765](go-gitea/gitea#28765)) ([#28768](go-gitea/gitea#28768)) - BUGFIXES - Use refname:strip-2 instead of refname:short when syncing tags ([#28797](go-gitea/gitea#28797)) ([#28811](go-gitea/gitea#28811)) - Fix links in issue card ([#28806](go-gitea/gitea#28806)) ([#28807](go-gitea/gitea#28807)) - Fix nil pointer panic when exec some gitea cli command ([#28791](go-gitea/gitea#28791)) ([#28795](go-gitea/gitea#28795)) - Require token for GET subscription endpoint ([#28765](go-gitea/gitea#28765)) ([#28778](go-gitea/gitea#28778)) - Fix button size in "attached header right" ([#28770](go-gitea/gitea#28770)) ([#28774](go-gitea/gitea#28774)) - Fix `convert.ToTeams` on empty input ([#28426](go-gitea/gitea#28426)) ([#28767](go-gitea/gitea#28767)) - Hide code related setting options in repository when code unit is disabled ([#28631](go-gitea/gitea#28631)) ([#28749](go-gitea/gitea#28749)) - Fix incorrect URL for "Reference in New Issue" ([#28716](go-gitea/gitea#28716)) ([#28723](go-gitea/gitea#28723)) - Fix panic when parsing empty pgsql host ([#28708](go-gitea/gitea#28708)) ([#28709](go-gitea/gitea#28709)) - Upgrade xorm to new version which supported update join for all supported databases ([#28590](go-gitea/gitea#28590)) ([#28668](go-gitea/gitea#28668)) - Fix alpine package files are not rebuilt ([#28638](go-gitea/gitea#28638)) ([#28665](go-gitea/gitea#28665)) - Avoid cycle-redirecting user/login page ([#28636](go-gitea/gitea#28636)) ([#28658](go-gitea/gitea#28658)) - Fix empty ref for cron workflow runs ([#28640](go-gitea/gitea#28640)) ([#28647](go-gitea/gitea#28647)) - Remove unnecessary syncbranchToDB with tests ([#28624](go-gitea/gitea#28624)) ([#28629](go-gitea/gitea#28629)) - Use known issue IID to generate new PR index number when migrating from GitLab ([#28616](go-gitea/gitea#28616)) ([#28618](go-gitea/gitea#28618)) - Fix flex container width ([#28603](go-gitea/gitea#28603)) ([#28605](go-gitea/gitea#28605)) - Fix the scroll behavior for emoji/mention list ([#28597](go-gitea/gitea#28597)) ([#28601](go-gitea/gitea#28601)) - Fix wrong due date rendering in issue list page ([#28588](go-gitea/gitea#28588)) ([#28591](go-gitea/gitea#28591)) - Fix `status_check_contexts` matching bug ([#28582](go-gitea/gitea#28582)) ([#28589](go-gitea/gitea#28589)) - Fix 500 error of searching commits ([#28576](go-gitea/gitea#28576)) ([#28579](go-gitea/gitea#28579)) - Use information from previous blame parts ([#28572](go-gitea/gitea#28572)) ([#28577](go-gitea/gitea#28577)) - Update mermaid for 1.21 ([#28571](go-gitea/gitea#28571)) - Fix 405 method not allowed CORS / OIDC ([#28583](go-gitea/gitea#28583)) ([#28586](go-gitea/gitea#28586)) ([#28587](go-gitea/gitea#28587)) ([#28611](go-gitea/gitea#28611)) - Fix `GetCommitStatuses` ([#28787](go-gitea/gitea#28787)) ([#28804](go-gitea/gitea#28804)) - Forbid removing the last admin user ([#28337](go-gitea/gitea#28337)) ([#28793](go-gitea/gitea#28793)) - Fix schedule tasks bugs ([#28691](go-gitea/gitea#28691)) ([#28780](go-gitea/gitea#28780)) - Fix issue dependencies ([#27736](go-gitea/gitea#27736)) ([#28776](go-gitea/gitea#28776)) - Fix system webhooks API bug ([#28531](go-gitea/gitea#28531)) ([#28666](go-gitea/gitea#28666)) - Fix when private user following user, private user will not be counted in his own view ([#28037](go-gitea/gitea#28037)) ([#28792](go-gitea/gitea#28792)) - Render code block in activity tab ([#28816](go-gitea/gitea#28816)) ([#28818](go-gitea/gitea#28818)) - ENHANCEMENTS - Rework markup link rendering ([#26745](go-gitea/gitea#26745)) ([#28803](go-gitea/gitea#28803)) - Modernize merge button ([#28140](go-gitea/gitea#28140)) ([#28786](go-gitea/gitea#28786)) - Speed up loading the dashboard on mysql/mariadb ([#28546](go-gitea/gitea#28546)) ([#28784](go-gitea/gitea#28784)) - Assign pull request to project during creation ([#28227](go-gitea/gitea#28227)) ([#28775](go-gitea/gitea#28775)) - Show description as tooltip instead of title for labels ([#28754](go-gitea/gitea#28754)) ([#28766](go-gitea/gitea#28766)) - Make template `DateTime` show proper tooltip ([#28677](go-gitea/gitea#28677)) ([#28683](go-gitea/gitea#28683)) - Switch destination directory for apt signing keys ([#28639](go-gitea/gitea#28639)) ([#28642](go-gitea/gitea#28642)) - Include heap pprof in diagnosis report to help debugging memory leaks ([#28596](go-gitea/gitea#28596)) ([#28599](go-gitea/gitea#28599)) - DOCS - Suggest to use Type=simple for systemd service ([#28717](go-gitea/gitea#28717)) ([#28722](go-gitea/gitea#28722)) - Extend description for ARTIFACT_RETENTION_DAYS ([#28626](go-gitea/gitea#28626)) ([#28630](go-gitea/gitea#28630)) - MISC - Add -F to commit search to treat keywords as strings ([#28744](go-gitea/gitea#28744)) ([#28748](go-gitea/gitea#28748)) - Add download attribute to release attachments ([#28739](go-gitea/gitea#28739)) ([#28740](go-gitea/gitea#28740)) - Concatenate error in `checkIfPRContentChanged` ([#28731](go-gitea/gitea#28731)) ([#28737](go-gitea/gitea#28737)) - Improve 1.21 document for Database Preparation ([#28643](go-gitea/gitea#28643)) ([#28644](go-gitea/gitea#28644)) Instances on **[Gitea Cloud](https://cloud.gitea.com)** will be automatically upgraded to this version during the specified maintenance window. </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.home/nrdufour/home-ops/pulls/316 Co-authored-by: Renovate <renovate@ptinem.io> Co-committed-by: Renovate <renovate@ptinem.io>

Fix go-gitea#28231, and remove some unused code. The `db.HasEngine` doesn't seem useful because the db engine is always initialized before web route.

wxiaoguang added type/bug backport/v1.21 This PR should be backported to Gitea 1.21 labels Dec 28, 2023

wxiaoguang added this to the 1.22.0 milestone Dec 28, 2023

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 28, 2023

pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Dec 28, 2023

wxiaoguang mentioned this pull request Dec 28, 2023

LANDING_PAGE=login leads to endless redirects if you're logged in #28231

Closed

wxiaoguang force-pushed the fix-login-redirect branch from 8d64c53 to 4ac5412 Compare December 28, 2023 15:04

fix

1474cfb

wxiaoguang force-pushed the fix-login-redirect branch from 4ac5412 to 1474cfb Compare December 28, 2023 15:08

lunny approved these changes Dec 29, 2023

View reviewed changes

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 Dec 29, 2023

denyskon approved these changes Dec 30, 2023

View reviewed changes

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 30, 2023

Merge branch 'main' into fix-login-redirect

3c8f5da

wxiaoguang enabled auto-merge (squash) December 30, 2023 08:25

wxiaoguang merged commit e5d8c4b into go-gitea:main Dec 30, 2023
25 checks passed

GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Dec 30, 2023

wxiaoguang deleted the fix-login-redirect branch December 30, 2023 12:03

wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Dec 30, 2023

Avoid cycle-redirecting user/login page (go-gitea#28636)

37e70e0

wxiaoguang mentioned this pull request Dec 30, 2023

Avoid cycle-redirecting user/login page (#28636) #28658

Merged

wxiaoguang added the backport/done All backports for this PR have been created label Dec 30, 2023

wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Dec 30, 2023

Avoid cycle-redirecting user/login page (go-gitea#28636)

5d4791c

lunny pushed a commit that referenced this pull request Dec 30, 2023

Avoid cycle-redirecting user/login page (#28636) (#28658)

2165729

Backport #28636 Fix #28231, and remove some unused code.

delvh mentioned this pull request Dec 30, 2023

Revert Fixing redirection issue for logged-in users #26105 #28166

Closed

github-actions bot locked as resolved and limited conversation to collaborators Mar 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Avoid cycle-redirecting user/login page #28636

Avoid cycle-redirecting user/login page #28636

wxiaoguang commented Dec 28, 2023

GiteaBot commented Dec 30, 2023

Avoid cycle-redirecting user/login page #28636

Avoid cycle-redirecting user/login page #28636

Conversation

wxiaoguang commented Dec 28, 2023

GiteaBot commented Dec 30, 2023