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

Fix missing images in editor preview due to wrong links (#31299) #31393

Merged
merged 1 commit into from
Jun 17, 2024
Merged

Fix missing images in editor preview due to wrong links (#31299) #31393

merged 1 commit into from
Jun 17, 2024

Conversation

wxiaoguang
Copy link
Contributor

Backport #31299

Parse base path and tree path so that media links can be correctly created with /media/.

Resolves #31294

Co-authored-by: Brecht Van Lommel brecht@blender.org

@GiteaBot GiteaBot added this to the 1.22.1 milestone Jun 17, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 17, 2024
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 17, 2024
@github-actions github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code labels Jun 17, 2024
@brechtvl @wxiaoguang
Fix missing images in editor preview due to wrong links (go-gitea#31299)
33bd653 
Parse base path and tree path so that media links can be correctly
created with /media/.

Resolves go-gitea#31294

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
# Conflicts:
#	routers/common/markup.go
@wxiaoguang wxiaoguang force-pushed the backport-editor-images branch from cbbb145 to 33bd653 Compare June 17, 2024 06:26
@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 Jun 17, 2024
@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 Jun 17, 2024
@wxiaoguang wxiaoguang merged commit fa30716 into go-gitea:release/v1.22 Jun 17, 2024
26 checks passed
@wxiaoguang wxiaoguang deleted the backport-editor-images branch June 17, 2024 07:07
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@yp05327 yp05327 yp05327 approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.1
Development

Successfully merging this pull request may close these issues.
5 participants
@wxiaoguang @lunny @yp05327 @GiteaBot @brechtvl