Skip to content

update tidb.net and asktug links (#22496)#22772

Merged
ti-chi-bot[bot] merged 3 commits intopingcap:release-6.1from
ti-chi-bot:cherry-pick-22496-to-release-6.1
Apr 17, 2026
Merged

update tidb.net and asktug links (#22496)#22772
ti-chi-bot[bot] merged 3 commits intopingcap:release-6.1from
ti-chi-bot:cherry-pick-22496-to-release-6.1

Conversation

@ti-chi-bot
Copy link
Copy Markdown
Member

This is an automated cherry-pick of #22496

What is changed, added or deleted? (Required)

tidb.net/blog -> pingkai.cn/tidbcommunity/blog
asktug.com -> pingkai.cn/tidbcommunity/forum
tidb.net -> pingkai.cn/tidbcommunity
search.asktug.com -> https://search.pingkai.cn

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v9.0 (TiDB 9.0 versions)
  • v8.5 (TiDB 8.5 versions)
  • v8.1 (TiDB 8.1 versions)
  • v7.5 (TiDB 7.5 versions)
  • v7.1 (TiDB 7.1 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)

What is the related PR or file link(s)?

Related issue: pingcap/tidb#65813

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. labels Apr 16, 2026
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 16, 2026
13 tasks
@ti-chi-bot
Copy link
Copy Markdown
Member Author

@qiancai This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot Bot commented Apr 16, 2026

@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request updates several documentation links to a new domain and adds community contact options for Discord and Slack. A critical issue was identified in explore-htap.md where unresolved git merge conflict markers were accidentally included in the file. A review comment provides a suggestion to remove these markers and ensure the links are correctly formatted and capitalized.

Comment thread explore-htap.md Outdated
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Comment thread explore-htap.md Outdated
@qiancai qiancai removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 17, 2026
@qiancai
Copy link
Copy Markdown
Collaborator

qiancai commented Apr 17, 2026

/approve

@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot Bot commented Apr 17, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qiancai

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot Bot added the approved label Apr 17, 2026
@ti-chi-bot ti-chi-bot Bot merged commit e5e25e4 into pingcap:release-6.1 Apr 17, 2026
7 of 9 checks passed
@ti-chi-bot ti-chi-bot Bot deleted the cherry-pick-22496-to-release-6.1 branch April 17, 2026 01:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants