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 rendered wiki page link #31398

Merged
merged 2 commits into from
Jun 18, 2024
Merged

Fix rendered wiki page link #31398

merged 2 commits into from
Jun 18, 2024

Conversation

wxiaoguang
Copy link
Contributor

Fix #31395

@wxiaoguang wxiaoguang added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels 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 the modifies/go Pull requests that update Go code label Jun 17, 2024
This was referenced Jun 17, 2024
Closed
Merged
@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 18, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) June 18, 2024 02:41
@wxiaoguang wxiaoguang merged commit 21783a5 into go-gitea:main Jun 18, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Jun 18, 2024
@GiteaBot
Copy link
Contributor

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

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

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Jun 18, 2024
@wxiaoguang wxiaoguang deleted the fix-wiki-link branch June 18, 2024 03:56
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Jun 18, 2024
@wxiaoguang
Fix rendered wiki page link (go-gitea#31398)
e00f8d5 
Fix go-gitea#31395
# Conflicts:
#	modules/markup/markdown/transform_link.go
#	routers/web/repo/view.go
@wxiaoguang wxiaoguang mentioned this pull request Jun 18, 2024
Merged
@wxiaoguang wxiaoguang added the backport/done All backports for this PR have been created label Jun 18, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 18, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
b815a27 
* giteaofficial/main:
  Fix rendered wiki page link (go-gitea#31398)
  Refactor repo unit "disabled" check (go-gitea#31389)
  Refactor route path normalization (go-gitea#31381)
  Refactor markup code (go-gitea#31399)
  Add cache test for admins (go-gitea#31265)
  Fix double border in system status table (go-gitea#31363)
  Improve rubygems package registry (go-gitea#31357)
  Fix natural sort (go-gitea#31384)
  Fix missing images in editor preview due to wrong links (go-gitea#31299)
  Add a simple test for AdoptRepository (go-gitea#31391)
  [skip ci] Updated licenses and gitignores
wxiaoguang added a commit that referenced this pull request Jun 19, 2024
@wxiaoguang
Fix rendered wiki page link (#31398) (#31407)
042e9fc 
Backport #31398

Fix #31395
silverwind added a commit to silverwind/gitea that referenced this pull request Jun 21, 2024
@silverwind
Merge remote-tracking branch 'origin/main' into tsconfig
afa931e 
* origin/main: (21 commits)
  Fix deprecated Dockerfile ENV format (go-gitea#31450)
  README Badge maintenance (go-gitea#31441)
  Improve markdown textarea for indentation and lists (go-gitea#31406)
  Split common-global.js into separate files (go-gitea#31438)
  Fix the link for .git-blame-ignore-revs bypass (go-gitea#31432)
  Bump htmx to 2.0.0 (go-gitea#31413)
  Fix the wrong line number in the diff view page when expanded twice. (go-gitea#31431)
  Fix labels and projects menu overflow on issue page (go-gitea#31435)
  [Fix] Account Linking UpdateMigrationsByType  (go-gitea#31428)
  Fix markdown math brackets render problem (go-gitea#31420)
  Reduce `air` verbosity (go-gitea#31417)
  Fix new issue/pr avatar (go-gitea#31419)
  Increase max length of org team names from 30 to 255 characters (go-gitea#31410)
  [skip ci] Updated translations via Crowdin
  Refactor names (go-gitea#31405)
  Update JS dependencies, remove `eslint-plugin-jquery` (go-gitea#31402)
  Switch to upstream of `gorilla/feeds` (go-gitea#31400)
  Fix rendered wiki page link (go-gitea#31398)
  Refactor repo unit "disabled" check (go-gitea#31389)
  Refactor route path normalization (go-gitea#31381)
  ...
@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

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

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! backport/v1.22 This PR should be backported to Gitea 1.22 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 size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

Regression - 1.22 wiki links which contain dots point to "raw" media and only return plain text
4 participants
@wxiaoguang @GiteaBot @lunny @silverwind