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 https setup doc zh-cn #24015

Merged
merged 2 commits into from
Apr 9, 2023
Merged

Fix https setup doc zh-cn #24015

merged 2 commits into from
Apr 9, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Apr 9, 2023

As title.

@lunny lunny added the type/docs This PR mainly updates/creates documentation label Apr 9, 2023
@silverwind
Copy link
Member

Has conflicts.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 9, 2023
@silverwind silverwind mentioned this pull request Apr 9, 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 Apr 9, 2023
@silverwind
Copy link
Member

Let's wait on #24021 to merge here and then validate that PR with this one.

@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 9, 2023
@6543 6543 merged commit 53439e5 into go-gitea:main Apr 9, 2023
@6543
Copy link
Member

6543 commented Apr 9, 2023

Let's wait on #24021 to merge here and then validate that PR with this one.

Sorry saw that afterwards

@silverwind silverwind mentioned this pull request Apr 9, 2023
Merged
@silverwind
Copy link
Member

This PR again broke the complicance pipeline because it fails markdownlint. Suggesting to land #24021 now and skip CI check for it so future docs-only PRs are validated correctly.

@silverwind
Copy link
Member

#24024 should fix the anchor

@lunny lunny deleted the lunny/fix_doc branch April 10, 2023 00:46
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 10, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
ac0dee9 
* upstream/main: (39 commits)
  Fix protected branch for API (go-gitea#24013)
  [skip ci] Updated translations via Crowdin
  Fix markdownlint (go-gitea#24024)
  Introduce lint-md and compliance-docs pipeline (go-gitea#24021)
  Fix https setup doc zh-cn (go-gitea#24015)
  Replace tribute with text-expander-element for textarea (go-gitea#23985)
  Improve GetBoards and getDefaultBoard (go-gitea#22981)
  Expand/Collapse all changed files (go-gitea#23639)
  Show errors for KaTeX and mermaid on the preview tab (go-gitea#24009)
  Show protected branch rule names again (go-gitea#23907)
  Reference the `zh-CN` version of `reverse-proxies` in `https-support` (go-gitea#24016)
  Fix lint problem in `https-support.zh-cn.md` (go-gitea#24014)
  docs: HTTPS configuration for zh-cn (go-gitea#23039)
  Re-add initial wiki page text when editing the page (go-gitea#23984)
  [skip ci] Updated translations via Crowdin
  fix: do not escape space between PyPI repository url and package name… (go-gitea#23981)
  Make bindata static build parse builtin templates correctly (go-gitea#24003)
  Group template helper functions, remove `Printf`, improve template error messages (go-gitea#23982)
  Adjust sticky pr header to cover background (go-gitea#23956)
  Update github.com/google/go-github to v51 (go-gitea#23946)
  ...
@delvh delvh added this to the 1.20.0 milestone May 10, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@6543 6543 6543 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. 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.
5 participants
@lunny @silverwind @6543 @GiteaBot @delvh