Skip to content
代码片段 群组 项目
未验证 提交 51b7c532 编辑于 作者: Phillip Wells's avatar Phillip Wells 提交者: GitLab
浏览文件

Merge branch '433277-aqualls-old-nav-steps' into 'master'

Update more nav instructions on Create pages

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145699



Merged-by: default avatarPhillip Wells <pwells@gitlab.com>
Approved-by: default avatarPhillip Wells <pwells@gitlab.com>
Co-authored-by: default avatarAmy Qualls <aqualls@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -23,8 +23,6 @@ This feature is available for merge requests across forked projects that are ...@@ -23,8 +23,6 @@ This feature is available for merge requests across forked projects that are
## Allow commits from upstream members ## Allow commits from upstream members
> - Enabled by default in [GitLab 13.7 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/23308).
As the author of a merge request, you can allow commit edits from As the author of a merge request, you can allow commit edits from
upstream members of the project you're contributing to: upstream members of the project you're contributing to:
...@@ -34,9 +32,10 @@ upstream members of the project you're contributing to: ...@@ -34,9 +32,10 @@ upstream members of the project you're contributing to:
1. Finish creating your merge request. 1. Finish creating your merge request.
After you create the merge request, the merge request widget displays the message After you create the merge request, the merge request widget displays the message
**Members who can merge are allowed to add commits**. Upstream members can then **Members who can merge are allowed to add commits**. Upstream members can then:
commit directly to your branch, as well as retry the pipelines and jobs of the
merge request. - Commit directly to your branch.
- Retry the pipelines and jobs of the merge request.
## Prevent commits from upstream members ## Prevent commits from upstream members
...@@ -64,9 +63,10 @@ In the following example: ...@@ -64,9 +63,10 @@ In the following example:
To change or add a commit to the contributor's merge request: To change or add a commit to the contributor's merge request:
1. Go to the merge request. 1. On the left sidebar, select **Search or go to** and find your project.
1. Select **Code > Merge requests** and find the merge request.
1. In the upper-right corner, select **Code**, then select **Check out branch**. 1. In the upper-right corner, select **Code**, then select **Check out branch**.
1. In the modal window, select **Copy** (**{copy-to-clipboard}**). 1. On the dialog, select **Copy** (**{copy-to-clipboard}**).
1. In your terminal, go to your cloned version of the repository, and 1. In your terminal, go to your cloned version of the repository, and
paste the commands. For example: paste the commands. For example:
...@@ -112,6 +112,7 @@ in the merge request. ...@@ -112,6 +112,7 @@ in the merge request.
To see the pipeline status from the merge request page of a forked project To see the pipeline status from the merge request page of a forked project
going back to the original project: going back to the original project:
1. Create a group containing all the upstream members. 1. [Create a group](../../group/index.md#create-a-group) containing all the upstream members.
1. On the left sidebar, select **Search or go to** and find the forked project.
1. Go to the **Manage > Members** page in the forked project and invite the newly-created 1. Go to the **Manage > Members** page in the forked project and invite the newly-created
group to the forked project. group to the forked project.
doc/user/project/merge_requests/img/create_new_issue_v15_4.png

11.6 KB

doc/user/project/merge_requests/img/new-issue-one-thread_v14_3.png

3.7 KB

doc/user/project/merge_requests/img/unresolved_threads_v15_4.png

3.6 KB

...@@ -82,10 +82,6 @@ or: ...@@ -82,10 +82,6 @@ or:
## Filter the list of merge requests ## Filter the list of merge requests
> - Filtering by `approved-by` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30335) in GitLab 13.0.
> - Filtering by `reviewer` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47605) in GitLab 13.7.
> - Filtering by potential approvers was moved to GitLab Premium in 13.9.
> - Filtering by `approved-by` moved to GitLab Premium in 13.9.
> - Filtering by `source-branch` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134555) in GitLab 16.6. > - Filtering by `source-branch` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134555) in GitLab 16.6.
> - Filtering by `merged-by` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140002) in GitLab 16.9. Available only when the feature flag `mr_merge_user_filter` is enabled. > - Filtering by `merged-by` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140002) in GitLab 16.9. Available only when the feature flag `mr_merge_user_filter` is enabled.
...@@ -116,8 +112,6 @@ To filter the list of merge requests: ...@@ -116,8 +112,6 @@ To filter the list of merge requests:
### By environment or deployment date ### By environment or deployment date
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44041) in GitLab 13.6.
To filter merge requests by deployment data, such as the environment or a date, To filter merge requests by deployment data, such as the environment or a date,
you can type (or select from the dropdown list) the following: you can type (or select from the dropdown list) the following:
...@@ -203,7 +197,8 @@ GitLab recommends you close the merge request rather than ...@@ -203,7 +197,8 @@ GitLab recommends you close the merge request rather than
Developer, Maintainer, or Owner [roles](../../permissions.md) in a project Developer, Maintainer, or Owner [roles](../../permissions.md) in a project
can close merge requests in the project: can close merge requests in the project:
1. Go to the merge request you want to close. 1. On the left sidebar, select **Search or go to** and find your project.
1. Select **Code > Merge requests** and find your merge request.
1. Scroll to the comment box at the bottom of the page. 1. Scroll to the comment box at the bottom of the page.
1. Following the comment box, select **Close merge request**. 1. Following the comment box, select **Close merge request**.
...@@ -213,15 +208,17 @@ its comments, and any associated pipelines. ...@@ -213,15 +208,17 @@ its comments, and any associated pipelines.
### Delete a merge request ### Delete a merge request
GitLab recommends you close, rather than delete, merge requests. GitLab recommends you close, rather than delete, merge requests.
WARNING:
You cannot undo the deletion of a merge request. You cannot undo the deletion of a merge request.
Prerequisites:
- You must have the Owner role for the project.
To delete a merge request: To delete a merge request:
1. Sign in to GitLab as a user with the project Owner role. 1. On the left sidebar, select **Search or go to** and find your project.
Only users with this role can delete merge requests in a project. 1. Select **Code > Merge requests** and find the merge request you want to delete.
1. Go to the merge request you want to delete, and select **Edit**. 1. Select **Edit**.
1. Scroll to the bottom of the page, and select **Delete merge request**. 1. Scroll to the bottom of the page, and select **Delete merge request**.
### Delete the source branch on merge ### Delete the source branch on merge
...@@ -239,9 +236,6 @@ DETAILS: ...@@ -239,9 +236,6 @@ DETAILS:
**Tier:** Free, Premium, Ultimate **Tier:** Free, Premium, Ultimate
**Offering:** Self-managed **Offering:** Self-managed
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/320902) in GitLab 13.9.
> - [Disabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/320902) in GitLab 13.9.
> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/320895) GitLab 13.10.
> - Chained merge requests [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/323329) to automatically rebase on the new target branch in GitLab 16.9. > - Chained merge requests [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/323329) to automatically rebase on the new target branch in GitLab 16.9.
Merge requests are often chained together, with one merge request depending on Merge requests are often chained together, with one merge request depending on
...@@ -354,21 +348,23 @@ sort order by clicking the sort button on the right. ...@@ -354,21 +348,23 @@ sort order by clicking the sort button on the right.
## Resolve a thread ## Resolve a thread
> - Resolving comments individually was [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/28750) in GitLab 13.6. When you want to finish a conversation in a merge request,
[resolve a thread](../../discussions/index.md#resolve-a-thread).
In a merge request, you can [resolve a thread](../../discussions/index.md#resolve-a-thread) when you want to finish a conversation.
At the top of the page, the number of unresolved threads is updated: The number of unresolved threads is shown in the top right corner of a
merge request, like this: **7 unresolved threads**.
![Count of unresolved threads](img/unresolved_threads_v15_4.png)
### Move all unresolved threads in a merge request to an issue ### Move all unresolved threads in a merge request to an issue
If you have multiple unresolved threads in a merge request, you can If you have multiple unresolved threads in a merge request, you can
create an issue to resolve them separately. In the merge request, at the top of the page, create an issue to resolve them separately:
select the ellipsis icon button (**{ellipsis_v}**) in the threads control and then select **Resolve all with new issue**:
![Open new issue for all unresolved threads](img/create_new_issue_v15_4.png) 1. On the left sidebar, select **Search or go to** and find your project.
1. Select **Code > Merge requests** and find your merge request.
1. In the merge request, in the top right, find the **Unresolved threads**
dropdown list, and select **Thread options** (**{ellipsis_v}**).
1. Select **Resolve all with new issue**.
1. Fill out the fields in the new issue, and select **Create issue**.
All threads are marked as resolved, and a link is added from the merge request to All threads are marked as resolved, and a link is added from the merge request to
the newly created issue. the newly created issue.
...@@ -376,10 +372,14 @@ the newly created issue. ...@@ -376,10 +372,14 @@ the newly created issue.
### Move one unresolved thread in a merge request to an issue ### Move one unresolved thread in a merge request to an issue
If you have one specific unresolved thread in a merge request, you can If you have one specific unresolved thread in a merge request, you can
create an issue to resolve it separately. In the merge request, under the last reply create an issue to resolve it separately:
to the thread, next to **Resolve thread**, select **Create issue to resolve thread** (**{issue-new}**):
![Create issue for thread](img/new-issue-one-thread_v14_3.png) 1. On the left sidebar, select **Search or go to** and find your project.
1. Select **Code > Merge requests** and find your merge request.
1. In the merge request, find the thread you want to move.
1. Below the last reply to the thread, next to **Resolve thread**, select
**Create issue to resolve thread** (**{issue-new}**).
1. Fill out the fields in the new issue, and select **Create issue**.
The thread is marked as resolved, and a link is added from the merge request to The thread is marked as resolved, and a link is added from the merge request to
the newly created issue. the newly created issue.
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册