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

add 'fonts' into 'KnownPublicEntries' #15188

Merged
merged 3 commits into from
Mar 30, 2021
Merged

add 'fonts' into 'KnownPublicEntries' #15188

merged 3 commits into from
Mar 30, 2021

Conversation

a1012112796
Copy link
Member

fix #15184

@a1012112796
add 'fonts' into 'KnownPublicEntries'
24ac58c 
fix go-gitea#15184

Signed-off-by: a1012112796 <1012112796@qq.com>
@a1012112796 a1012112796 added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Mar 29, 2021
@a1012112796
Copy link
Member Author

Proposal: add an root subtree like /_public/xxxx or /_static/xxx for static subtrees, then these simple words can be used as user name, Thanks.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 29, 2021
@a1012112796
Copy link
Member Author

I found favicon.ico is not a subtree in public tree, maybe should move it into reservedUsernames

@silverwind
Copy link
Member

silverwind commented Mar 29, 2021 •
edited
Loading

Proposal: add an root subtree like /_public/xxxx or /_static/xxx for static subtrees

I would call it "assets", probably with an additional invalid username character to prevent collision with existing usernames. Or maybe go with the name as-is and call it out in the changelog. It should be the last file-related reserved username we assign and it would clear up all the others.

@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 Mar 29, 2021
@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 Mar 30, 2021
@lafriks lafriks merged commit f5b6dc9 into go-gitea:master Mar 30, 2021
@lafriks
Copy link
Member

lafriks commented Mar 30, 2021

please backport to 1.14

@a1012112796 a1012112796 added this to the 1.15.0 milestone Mar 31, 2021
@a1012112796 a1012112796 deleted the block_fonts_user branch March 31, 2021 00:59
a1012112796 added a commit to a1012112796/gitea that referenced this pull request Mar 31, 2021
@a1012112796 @lunny
add 'fonts' into 'KnownPublicEntries' (go-gitea#15188)
13a323e 
fix go-gitea#15184

Signed-off-by: a1012112796 <1012112796@qq.com>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@a1012112796 a1012112796 mentioned this pull request Mar 31, 2021
Merged
6543 pushed a commit that referenced this pull request Mar 31, 2021
@a1012112796 @lunny
add 'fonts' into 'KnownPublicEntries' (#15188) (#15218)
92b2883 
fix #15184

Signed-off-by: a1012112796 <1012112796@qq.com>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
6543 pushed a commit to 6543-forks/gitea that referenced this pull request Apr 7, 2021
@a1012112796 @lunny @6543
add 'fonts' into 'KnownPublicEntries' (go-gitea#15188)
85f7ecf 
fix go-gitea#15184

Signed-off-by: a1012112796 <1012112796@qq.com>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@6543 6543 mentioned this pull request Apr 7, 2021
Merged
@6543 6543 added backport/done All backports for this PR have been created and removed skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Apr 7, 2021
@6543
Copy link
Member

6543 commented Apr 7, 2021

Backport -> #15317

zeripath pushed a commit that referenced this pull request Apr 7, 2021
@6543 @a1012112796 @lunny
add 'fonts' into 'KnownPublicEntries' (#15188) (#15317)
bfd3308 
fix #15184

Signed-off-by: a1012112796 <1012112796@qq.com>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

Co-authored-by: a1012112796 <1012112796@qq.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@go-gitea go-gitea locked and limited conversation to collaborators May 13, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

@lafriks lafriks lafriks approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created 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.0
Development

Successfully merging this pull request may close these issues.

organization name url route conflict
6 participants
@a1012112796 @silverwind @lafriks @6543 @lunny @GiteaBot