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 some incorrect links in docs (#28191) #28233

Merged
merged 2 commits into from
Nov 27, 2023
Merged

Fix some incorrect links in docs (#28191) #28233

merged 2 commits into from
Nov 27, 2023

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Nov 26, 2023

Backport #28191

@GiteaBot GiteaBot added this to the 1.20.6 milestone Nov 26, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 26, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 26, 2023
lng2020
lng2020 reviewed Nov 27, 2023
View reviewed changes
docs/content/help/faq.en-us.md Outdated
@@ -39,7 +39,6 @@ If a bug fix is targeted on 1.20.1 but 1.20.1 is not released yet, you can get t

To migrate from Gogs to Gitea:

- [Gogs version 0.9.146 or less](installation/upgrade-from-gogs.md)
Copy link
Member

@lng2020 lng2020 Nov 27, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

This looks wrong to me. The document was removed in main and its milestone is 1.22. So this backport and the backport to 1.21(though that is merged) should not include this one. If you want to raise a PR to fix the ../../ error, this one can be fixed in 1.21 by the way.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reverted.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So this backport and the backport to 1.21(though that is merged) should not include this one.

#28235

docs/content/help/faq.zh-cn.md Outdated Show resolved Hide resolved
@yp05327 yp05327 mentioned this pull request Nov 27, 2023
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 Nov 27, 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 Nov 27, 2023
@techknowlogick techknowlogick merged commit 088d746 into go-gitea:release/v1.20 Nov 27, 2023
21 checks passed
6543 pushed a commit that referenced this pull request Nov 27, 2023
@yp05327
Revert move installation/upgrade-from-gogs.md in 1.21 (#28235)
96141e4 
#28233 (comment)
@yp05327 yp05327 deleted the backport-28191 branch November 28, 2023 02:52
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Feb 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lng2020 lng2020 lng2020 left review comments

@delvh delvh delvh approved these changes

@techknowlogick techknowlogick techknowlogick 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.20.6
Development

Successfully merging this pull request may close these issues.
5 participants
@yp05327 @techknowlogick @delvh @lng2020 @GiteaBot