2018-10-18 02:19:04 +08:00
|
|
|
---
|
|
|
|
|
date: "2018-06-01T19:00:00+02:00"
|
2023-05-23 18:14:57 +08:00
|
|
|
title: "合并请求"
|
2018-10-18 02:19:04 +08:00
|
|
|
slug: "pull-request"
|
2023-07-26 10:00:14 +08:00
|
|
|
sidebar_position: 13
|
2020-12-09 14:47:06 +08:00
|
|
|
toc: false
|
2018-10-18 02:19:04 +08:00
|
|
|
draft: false
|
Refactor docs (#23752)
This was intended to be a small followup for
https://github.com/go-gitea/gitea/pull/23712, but...here we are.
1. Our docs currently use `slug` as the entire URL, which makes
refactoring tricky (see https://github.com/go-gitea/gitea/pull/23712).
Instead, this PR attempts to make future refactoring easier by using
slugs as an extension of the section. (Hugo terminology)
- What the above boils down to is this PR attempts to use directory
organization as URL management. e.g. `usage/comparison.en-us.md` ->
`en-us/usage/comparison/`, `usage/packages/overview.en-us.md` ->
`en-us/usage/packages/overview/`
- Technically we could even remove `slug`, as Hugo defaults to using
filename, however at least with this PR it means `slug` only needs to be
the name for the **current file** rather than an entire URL
2. This PR adds appropriate aliases (redirects) for pages, so anything
on the internet that links to our docs should hopefully not break.
3. A minor nit I've had for a while, renaming `seek-help` to `support`.
It's a minor thing, but `seek-help` has a strange connotation to it.
4. The commits are split such that you can review the first which is the
"actual" change, and the second is added redirects so that the first
doesn't break links elsewhere.
---------
Signed-off-by: jolheiser <john.olheiser@gmail.com>
2023-04-28 11:33:41 +08:00
|
|
|
aliases:
|
|
|
|
|
- /zh-cn/pull-request
|
2018-10-18 02:19:04 +08:00
|
|
|
menu:
|
|
|
|
|
sidebar:
|
|
|
|
|
parent: "usage"
|
|
|
|
|
name: "Pull Request"
|
2023-07-26 10:00:14 +08:00
|
|
|
sidebar_position: 13
|
2018-10-18 02:19:04 +08:00
|
|
|
identifier: "pull-request"
|
|
|
|
|
---
|
|
|
|
|
|
2023-05-23 18:14:57 +08:00
|
|
|
# 合并请求
|
2018-10-18 02:19:04 +08:00
|
|
|
|
2023-05-23 18:14:57 +08:00
|
|
|
## 在`合并请求`中使用“Work In Progress”标记
|
2018-10-18 02:19:04 +08:00
|
|
|
|
|
|
|
|
您可以通过在一个进行中的 pull request 的标题上添加前缀 `WIP:` 或者 `[WIP]`（此处大小写敏感）来防止它被意外合并，具体的前缀设置可以在配置文件 `app.ini` 中找到：
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
|
[repository.pull-request]
|
|
|
|
|
WORK_IN_PROGRESS_PREFIXES=WIP:,[WIP]
|
|
|
|
|
```
|
|
|
|
|
|
|
|
|
|
列表的第一个值将用于 helpers 程序。
|
|
|
|
|
|
2023-05-23 18:14:57 +08:00
|
|
|
## 合并请求模板
|
2018-10-18 02:19:04 +08:00
|
|
|
|
2023-05-23 18:14:57 +08:00
|
|
|
有关合并请求模板的更多信息请您移步 : [工单与合并请求模板](issue-pull-request-templates)
|