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 documentation ref #24934

Merged
merged 4 commits into from
May 25, 2023
Merged

Fix documentation ref #24934

merged 4 commits into from
May 25, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented May 25, 2023

Fix documentation ref

@lunny lunny added type/bug type/docs This PR mainly updates/creates documentation labels May 25, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 25, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 25, 2023
@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 May 25, 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 May 25, 2023
@techknowlogick techknowlogick added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label May 25, 2023
@lunny lunny merged commit 694f70b into go-gitea:main May 25, 2023
21 checks passed
@GiteaBot GiteaBot added this to the 1.20.0 milestone May 25, 2023
@lunny lunny deleted the lunny/fix_ref branch May 25, 2023 16:19
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 26, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
f90f495 
* upstream/main:
  Use the type RefName for all the needed places and fix pull mirror sync bugs (go-gitea#24634)
  [skip ci] Updated translations via Crowdin
  Add Link to Stars and Forks Page to Repo List (go-gitea#24931)
  Fix documentation ref (go-gitea#24934)
  Add Chinese docs for help, contribution and development (go-gitea#24925)
  Merge two translation contributing documents (go-gitea#23939)
  Add the ability to pin Issues (go-gitea#24406)
  Use `shared/issueicon` template in projects (go-gitea#24922)
  Allow skipping forks and mirrors from being indexed (go-gitea#23187)
  Add Chinese documentations for Actions (go-gitea#24902)

# Conflicts:
#	templates/repo/issue/view_content/sidebar.tmpl
@HesterG HesterG mentioned this pull request May 31, 2023
Merged
lunny pushed a commit that referenced this pull request May 31, 2023
@HesterG @Zettat123
Add Chinese docs for help, contribution and development (#24925) (#25011
37b73b3 
)

Backport #24925, partially backport #24934
(`docs/content/doc/help/faq.zh-cn.md` file)

Part of backport has already done by #24942

Also backport #24881 to avoid "deadlock"

---------

Co-authored-by: Zettat123 <zettat123@gmail.com>
Codeberg-org pushed a commit to Codeberg-org/gitea that referenced this pull request Jun 7, 2023
@HesterG @earl-warren
Add Chinese docs for help, contribution and development (go-gitea#24925…
3f4a67e 
…) (go-gitea#25011)

Backport go-gitea#24925, partially backport go-gitea#24934
(`docs/content/doc/help/faq.zh-cn.md` file)

Part of backport has already done by go-gitea#24942

Also backport go-gitea#24881 to avoid "deadlock"

---------

Co-authored-by: Zettat123 <zettat123@gmail.com>
(cherry picked from commit 37b73b3)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@sillyguodong sillyguodong sillyguodong 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/M Denotes a PR that changes 30-99 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug type/docs This PR mainly updates/creates documentation
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lunny @techknowlogick @sillyguodong @GiteaBot