Skip to content
代码片段 群组 项目
提交 af271ded 编辑于 作者: Amy Qualls's avatar Amy Qualls 提交者: Phillip Wells
浏览文件

Update and remove images from main MR page

Start by removing two old images, and rephrasing some text to
cope with their absence.
上级 953ae43c
No related branches found
No related tags found
无相关合并请求
显示
15 个添加18 个删除
...@@ -12,7 +12,7 @@ or open threads, you can prevent it from being accepted before you ...@@ -12,7 +12,7 @@ or open threads, you can prevent it from being accepted before you
[mark it as ready](#mark-merge-requests-as-ready). Flag it as a draft to disable [mark it as ready](#mark-merge-requests-as-ready). Flag it as a draft to disable
the **Merge** button until you remove the **Draft** flag: the **Merge** button until you remove the **Draft** flag:
![Blocked Merge Button](img/draft_blocked_merge_button_v13_10.png) ![Blocked Merge Button](img/merge_request_draft_blocked_v16_0.png)
## Mark merge requests as drafts ## Mark merge requests as drafts
...@@ -42,10 +42,7 @@ When a merge request is ready to be merged, you can remove the `Draft` flag in s ...@@ -42,10 +42,7 @@ When a merge request is ready to be merged, you can remove the `Draft` flag in s
- **Viewing a merge request**: In the upper-right corner of the merge request, select **Mark as ready**. - **Viewing a merge request**: In the upper-right corner of the merge request, select **Mark as ready**.
Users with at least the Developer role Users with at least the Developer role
can also scroll to the bottom of the merge request description and select **Mark as ready**: can also scroll to the bottom of the merge request description and select **Mark as ready**.
![Mark as ready](img/draft_blocked_merge_button_v13_10.png)
- **Editing an existing merge request**: Remove `[Draft]`, `Draft:` or `(Draft)` - **Editing an existing merge request**: Remove `[Draft]`, `Draft:` or `(Draft)`
from the beginning of the title, or clear **Mark as draft** from the beginning of the title, or clear **Mark as draft**
below the **Title** field. below the **Title** field.
...@@ -71,7 +68,7 @@ draft merge requests: ...@@ -71,7 +68,7 @@ draft merge requests:
1. Select **Yes** to include drafts, or **No** to exclude, and press **Return** 1. Select **Yes** to include drafts, or **No** to exclude, and press **Return**
to update the list of merge requests: to update the list of merge requests:
![Filter draft merge requests](img/filter_draft_merge_requests_v13_10.png) ![Filter draft merge requests](img/filter_draft_merge_requests_v16_0.png)
## Pipelines for drafts ## Pipelines for drafts
......
doc/user/project/merge_requests/img/auto_merge_ready_v16_0.png

8.5 KB

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

4.3 KB

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

4.5 KB

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

11.1 KB

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

30.3 KB

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

10.9 KB

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

26.0 KB

...@@ -93,6 +93,8 @@ or: ...@@ -93,6 +93,8 @@ or:
To filter the list of merge requests: To filter the list of merge requests:
1. On the top bar, select **Main menu > Projects** and find your project.
1. On the left sidebar, select **Merge requests**.
1. Above the list of merge requests, select **Search or filter results...**. 1. Above the list of merge requests, select **Search or filter results...**.
1. From the dropdown list, select the attribute you wish to filter by. Some examples: 1. From the dropdown list, select the attribute you wish to filter by. Some examples:
- [**By environment or deployment date**](#by-environment-or-deployment-date). - [**By environment or deployment date**](#by-environment-or-deployment-date).
...@@ -132,17 +134,15 @@ Projects using a [fast-forward merge method](methods/index.md#fast-forward-merge ...@@ -132,17 +134,15 @@ Projects using a [fast-forward merge method](methods/index.md#fast-forward-merge
do not return results, as this method does not create a merge commit. do not return results, as this method does not create a merge commit.
When filtering by an environment, a dropdown list presents all environments that When filtering by an environment, a dropdown list presents all environments that
you can choose from: you can choose from.
![Filter MRs by their environment](img/filtering_merge_requests_by_environment_v14_6.png)
When filtering by `Deployed-before` or `Deployed-after`, the date refers to when When filtering by `Deployed-before` or `Deployed-after`:
the deployment to an environment (triggered by the merge commit) completed successfully.
You must enter the deploy date manually. Deploy dates
use the format `YYYY-MM-DD`, and must be quoted if you wish to specify
both a date and time (`"YYYY-MM-DD HH:MM"`):
![Filter MRs by a deploy date](img/filtering_merge_requests_by_date_v14_6.png) - The date refers to when the deployment to an environment (triggered by the
merge commit) completed successfully.
- You must enter the deploy date manually.
- Deploy dates use the format `YYYY-MM-DD`, and must be wrapped in double quotes (`"`)
if you want to specify both a date and time (`"YYYY-MM-DD HH:MM"`).
## Add changes to a merge request ## Add changes to a merge request
...@@ -182,7 +182,7 @@ The merge request is added to the user's assigned merge request list. ...@@ -182,7 +182,7 @@ The merge request is added to the user's assigned merge request list.
GitLab enables multiple assignees for merge requests, if multiple people are GitLab enables multiple assignees for merge requests, if multiple people are
accountable for it: accountable for it:
![multiple assignees for merge requests sidebar](img/multiple_assignees_for_merge_requests_sidebar.png) ![multiple assignees for merge requests sidebar](img/merge_request_assignees_v16_0.png)
To assign multiple assignees to a merge request, use the `/assign @user` To assign multiple assignees to a merge request, use the `/assign @user`
[quick action](../quick_actions.md#issues-merge-requests-and-epics) in a text area, or: [quick action](../quick_actions.md#issues-merge-requests-and-epics) in a text area, or:
......
...@@ -13,7 +13,7 @@ If you review a merge request and it's ready to merge, but the pipeline hasn't ...@@ -13,7 +13,7 @@ If you review a merge request and it's ready to merge, but the pipeline hasn't
completed yet, you can set it to auto-merge. You don't completed yet, you can set it to auto-merge. You don't
have to remember later to merge the work manually: have to remember later to merge the work manually:
![Auto-merge a merge request](img/mwps_v15_4.png) ![Auto-merge is ready](img/auto_merge_ready_v16_0.png)
NOTE: NOTE:
[In GitLab 16.0 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/359057), **Merge when pipeline succeeds** and **Add to merge train when pipeline succeeds** are renamed **Set to auto-merge**. [In GitLab 16.0 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/359057), **Merge when pipeline succeeds** and **Add to merge train when pipeline succeeds** are renamed **Set to auto-merge**.
......
...@@ -41,7 +41,7 @@ for environments. If it's the first time the branch is deployed, the link ...@@ -41,7 +41,7 @@ for environments. If it's the first time the branch is deployed, the link
returns a `404` error until done. During the deployment, the stop button is returns a `404` error until done. During the deployment, the stop button is
disabled. If the pipeline fails to deploy, the deployment information is hidden. disabled. If the pipeline fails to deploy, the deployment information is hidden.
![Merge request pipeline](img/merge_request_pipeline.png) ![Merge request pipeline](img/post_merge_pipeline_v16_0.png)
For more information, [read about pipelines](../../../ci/pipelines/index.md). For more information, [read about pipelines](../../../ci/pipelines/index.md).
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册