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.

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

Support "." char as user name for User/Orgs in RSS/ATOM/GPG/KEYS path ... #23874

Merged
merged 19 commits into from
Apr 7, 2023
Merged

Support "." char as user name for User/Orgs in RSS/ATOM/GPG/KEYS path ... #23874

merged 19 commits into from
Apr 7, 2023

Conversation

6543
Copy link
Member

@6543 6543 commented Apr 2, 2023 •
edited
Loading

@6543 6543 added the type/bug label Apr 2, 2023
6543
6543 commented Apr 2, 2023
View reviewed changes
routers/web/web.go Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 2, 2023
@6543 6543 added this to the 1.20.0 milestone Apr 2, 2023
@6543 6543 added outdated/backport/v1.19 This PR should be backported to Gitea 1.19 outdated/backport/v1.18 This PR should be backported to Gitea 1.18 labels Apr 2, 2023
yardenshoham
yardenshoham reviewed Apr 2, 2023
View reviewed changes
build.go Outdated Show resolved Hide resolved
@6543 6543 requested a review from a team April 2, 2023 17:40
@6543 6543 mentioned this pull request Apr 2, 2023
Open
11 tasks
@yardenshoham yardenshoham removed the outdated/backport/v1.18 This PR should be backported to Gitea 1.18 label Apr 2, 2023
@6543
Copy link
Member Author

6543 commented Apr 2, 2023 •
edited
Loading

@yardenshoham why did you remove the backport label if #22301 was assigned to v1.18.6 ?!?

ah damed that milestone never got cleaned up :/ *done now

@wxiaoguang wxiaoguang mentioned this pull request Apr 2, 2023
Merged
@zeripath
Copy link
Contributor

zeripath commented Apr 2, 2023

wouldn't m.Get("/{username}.png", func(ctx *context.Context) { etc. work?

@6543 6543 added the pr/breaking Merging this PR means builds will break. Needs a description what exactly breaks, and how to fix it! label Apr 2, 2023
@yardenshoham yardenshoham removed the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Apr 2, 2023
6543
6543 commented Apr 2, 2023
View reviewed changes
models/user/user.go Outdated Show resolved Hide resolved
@6543 6543 changed the title Support "." char as user name for User/Orgs in RSS/ATOM/PNG/GPG/KEYS path ... Support "." char as user name for User/Orgs in RSS/ATOM/GPG/KEYS path ... Apr 2, 2023
@6543
Copy link
Member Author

6543 commented Apr 2, 2023

wouldn't m.Get("/{username}.png", func(ctx *context.Context) { etc. work?

well that's also affected by the chi issue :/ so NO sadly

@6543 6543 added the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Apr 2, 2023
@6543 6543 mentioned this pull request Apr 3, 2023
Merged
@6543

This comment was marked as outdated.

Sign in to view
@6543 6543 added the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label Apr 3, 2023
@wxiaoguang

This comment was marked as outdated.

Sign in to view
@6543

This comment was marked as outdated.

Sign in to view
zeripath
zeripath reviewed Apr 3, 2023
View reviewed changes
routers/web/web.go
}, func(ctx *context.Context) {
ctx.Data["EnableFeed"] = setting.EnableFeed
}, context_service.UserAssignmentWeb())
m.Get("/{username}", func(ctx *context.Context) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I think this function should get moved out of web.go and into a named function within routers/web/user - and we should probably also update the routing.UpdateFuncInfo(req.Context(), ...) (Although we should do that without causing the funcInfo to be generated at run time.)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the best case the upstream issue get solved ...

the question is if we wana have that workaround now in or engineer around it properly ... or wait for upstream

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have personally given up on waiting for chi to fix any issues 😉

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well that would mean we must fix and submit a patch upstream 😆

@GiteaBot GiteaBot mentioned this pull request Apr 3, 2023
Merged
jolheiser pushed a commit that referenced this pull request Apr 3, 2023
@GiteaBot @wxiaoguang
Fix user profile description rendering (#23882) (#23902)
ac57ec5 
Backport #23882 by @wxiaoguang

Found an UI problem when testing #23874

The `ul li` styles were polluted.

Before:


![image](https://user-images.githubusercontent.com/2114189/229409756-22438268-ee36-4e4a-a20b-04ee8ee4a79d.png)


After:


![image](https://user-images.githubusercontent.com/2114189/229409809-25cea715-b6f1-4346-9bb4-3fbb58fcca65.png)

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@GiteaBot GiteaBot mentioned this pull request Apr 4, 2023
Merged
@6543 6543 mentioned this pull request Apr 4, 2023
Closed
@6543 6543 removed pr/breaking Merging this PR means builds will break. Needs a description what exactly breaks, and how to fix it! status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR labels Apr 4, 2023
@6543
Copy link
Member Author

6543 commented Apr 4, 2023

moved breaking part into #23908

6543 added a commit that referenced this pull request Apr 4, 2023
@GiteaBot @6543
User/Org Feed render description as per web (#23887) (#23906)
dff3ce0 
Backport #23887 by @6543

User descriptions should be rendered so that links and other markup
appear correct in RSS feeds.

test will be added by #23874

Co-authored-by: 6543 <6543@obermui.de>
@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 Apr 4, 2023
@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 Apr 7, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 7, 2023
@lunny lunny merged commit 8803343 into go-gitea:main Apr 7, 2023
@lunny lunny deleted the fix_22301 branch April 7, 2023 10:08
@lunny lunny removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 7, 2023
lunny pushed a commit that referenced this pull request Apr 7, 2023
@6543
Support "." char as user name for User/Orgs in RSS/ATOM/GPG/KEYS path…
085b563 
… ... (#23874) (#23878)

Backport #23874
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@yardenshoham yardenshoham yardenshoham left review comments

@zeripath zeripath zeripath left review comments

@silverwind silverwind silverwind approved these changes

@lunny lunny lunny approved these changes

@wxiaoguang wxiaoguang Awaiting requested review from wxiaoguang

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 type/bug
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.

[Bug] RSS URI Access Encoding Issues
8 participants
@6543 @zeripath @yardenshoham @codecov-commenter @silverwind @wxiaoguang @lunny @GiteaBot