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 view commit link #30297

Merged
merged 1 commit into from
Apr 5, 2024
Merged

Fix view commit link #30297

merged 1 commit into from
Apr 5, 2024

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Apr 5, 2024 •
edited
Loading

Fix #30098

Major changes:

  1. Do not show the "view at history point" button for wiki pages (because the wiki doesn't support it)
  2. Reformat the code, because the old code is strangely indented (please compare by ignoring spaces https://github.com/go-gitea/gitea/pull/30297/files?diff=split&w=1)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 5, 2024
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 5, 2024
@github-actions github-actions bot added the modifies/templates This PR modifies the template files label Apr 5, 2024
@wxiaoguang wxiaoguang added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 and removed modifies/templates This PR modifies the template files labels Apr 5, 2024
@wxiaoguang wxiaoguang requested a review from zokkis April 5, 2024 17:30
@wxiaoguang wxiaoguang mentioned this pull request Apr 5, 2024
Closed
@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 5, 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 Apr 5, 2024
@wxiaoguang wxiaoguang merged commit b2b49c9 into go-gitea:main Apr 5, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Apr 5, 2024
@wxiaoguang wxiaoguang deleted the fix-commit-view branch April 5, 2024 18:03
@GiteaBot
Copy link
Contributor

GiteaBot commented Apr 5, 2024

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

go run ./contrib/backport 30297
...  // 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 Apr 5, 2024
@wxiaoguang wxiaoguang mentioned this pull request Apr 5, 2024
Merged
wxiaoguang added a commit that referenced this pull request Apr 5, 2024
@wxiaoguang
Fix view commit link (#30297) (#30299)
02bf0a8 
Backport #30297
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 8, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
aa3428f 
* giteaofficial/main: (26 commits)
  Fix oauth2 builtin application logic (go-gitea#30304)
  [skip ci] Updated licenses and gitignores
  Some NuGet package enhancements (go-gitea#30280)
  Fix and rewrite contrast color calculation, fix project-related bugs (go-gitea#30237)
  Add `--page-spacing` variable, fix admin dashboard notice (go-gitea#30302)
  Action view mobile improvements and fixes (go-gitea#30309)
  Fix checkboxes on mobile view, remove some dead css (go-gitea#30308)
  Clean up log messages (go-gitea#30313)
  Fix right-aligned input icons (go-gitea#30301)
  Refactor startup deprecation messages (go-gitea#30305)
  [skip ci] Updated translations via Crowdin
  Remove fomantic list module (go-gitea#30281)
  Markup color and font size fixes (go-gitea#30282)
  Fix code block style for code preview (go-gitea#30298)
  Always use `octicon-eye` on watch button (go-gitea#30288)
  Fix view commit link (go-gitea#30297)
  Add gap to commit status details (go-gitea#30284)
  Update JS dependencies and add new eslint rules (go-gitea#30279)
  Upgrade `golang.org/x/net` to v0.24.0 (go-gitea#30283)
  Commit-Dropdown: Show Author of commit if available (go-gitea#30272)
  ...

# Conflicts:
#	templates/base/footer_content.tmpl
AvengerMoJo pushed a commit to AvengerMoJo/gitea that referenced this pull request Apr 8, 2024
@wxiaoguang @AvengerMoJo
Fix view commit link (go-gitea#30297)
e168de1 
Fix go-gitea#30098
@wxiaoguang wxiaoguang modified the milestones: 1.23.0, 1.22.0 Apr 27, 2024
@wxiaoguang wxiaoguang removed backport/manual No power to the bots! Create your backport yourself! backport/v1.22 This PR should be backported to Gitea 1.22 labels Jun 20, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@zokkis zokkis zokkis approved these changes

@delvh delvh delvh 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

View at this point in history is 404 in wiki revisions page
4 participants
@wxiaoguang @GiteaBot @delvh @zokkis