diff --git a/doc/user/project/merge_requests/drafts.md b/doc/user/project/merge_requests/drafts.md index 88e5e4a62836c164d4092b7fe0342dd63b6100b3..6f309d2db24b0469052f5e03f2fb69bcbee5facd 100644 --- a/doc/user/project/merge_requests/drafts.md +++ b/doc/user/project/merge_requests/drafts.md @@ -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 the **Merge** button until you remove the **Draft** flag: - + ## 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 - **Viewing a merge request**: In the upper-right corner of the merge request, select **Mark as ready**. 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**. - **Editing an existing merge request**: Remove `[Draft]`, `Draft:` or `(Draft)` from the beginning of the title, or clear **Mark as draft** below the **Title** field. @@ -71,7 +68,7 @@ draft merge requests: 1. Select **Yes** to include drafts, or **No** to exclude, and press **Return** to update the list of merge requests: -  +  ## Pipelines for drafts diff --git a/doc/user/project/merge_requests/img/auto_merge_ready_v16_0.png b/doc/user/project/merge_requests/img/auto_merge_ready_v16_0.png new file mode 100644 index 0000000000000000000000000000000000000000..e68057e73a0262ec88cef5a837b94e170fd0bcde Binary files /dev/null and b/doc/user/project/merge_requests/img/auto_merge_ready_v16_0.png differ diff --git a/doc/user/project/merge_requests/img/draft_blocked_merge_button_v13_10.png b/doc/user/project/merge_requests/img/draft_blocked_merge_button_v13_10.png deleted file mode 100644 index 3bac9f7fee876cf2d70d67a42535dcfcbf849a1e..0000000000000000000000000000000000000000 Binary files a/doc/user/project/merge_requests/img/draft_blocked_merge_button_v13_10.png and /dev/null differ diff --git a/doc/user/project/merge_requests/img/filter_draft_merge_requests_v13_10.png b/doc/user/project/merge_requests/img/filter_draft_merge_requests_v13_10.png deleted file mode 100644 index 4458df987d6be65d90416bfde8b22f1ba76efd9d..0000000000000000000000000000000000000000 Binary files a/doc/user/project/merge_requests/img/filter_draft_merge_requests_v13_10.png and /dev/null differ diff --git a/doc/user/project/merge_requests/img/filter_draft_merge_requests_v16_0.png b/doc/user/project/merge_requests/img/filter_draft_merge_requests_v16_0.png new file mode 100644 index 0000000000000000000000000000000000000000..f4356aade16bd5942489def465adf4ed658bc3d3 Binary files /dev/null and b/doc/user/project/merge_requests/img/filter_draft_merge_requests_v16_0.png differ diff --git a/doc/user/project/merge_requests/img/filtering_merge_requests_by_date_v14_6.png b/doc/user/project/merge_requests/img/filtering_merge_requests_by_date_v14_6.png deleted file mode 100644 index 398820f78649f241ea1b25a4b5c53c731b44c3fc..0000000000000000000000000000000000000000 Binary files a/doc/user/project/merge_requests/img/filtering_merge_requests_by_date_v14_6.png and /dev/null differ diff --git a/doc/user/project/merge_requests/img/filtering_merge_requests_by_environment_v14_6.png b/doc/user/project/merge_requests/img/filtering_merge_requests_by_environment_v14_6.png deleted file mode 100644 index c35f2c8a58b7fd30998e2ba041f36092449728d7..0000000000000000000000000000000000000000 Binary files a/doc/user/project/merge_requests/img/filtering_merge_requests_by_environment_v14_6.png and /dev/null differ diff --git a/doc/user/project/merge_requests/img/merge_request_assignees_v16_0.png b/doc/user/project/merge_requests/img/merge_request_assignees_v16_0.png new file mode 100644 index 0000000000000000000000000000000000000000..114ddf612e03c4a84a16750324f9ceaeb646296c Binary files /dev/null and b/doc/user/project/merge_requests/img/merge_request_assignees_v16_0.png differ diff --git a/doc/user/project/merge_requests/img/merge_request_draft_blocked_v16_0.png b/doc/user/project/merge_requests/img/merge_request_draft_blocked_v16_0.png new file mode 100644 index 0000000000000000000000000000000000000000..88fe1ec34c0fee421503705bf44ddb42f379d427 Binary files /dev/null and b/doc/user/project/merge_requests/img/merge_request_draft_blocked_v16_0.png differ diff --git a/doc/user/project/merge_requests/img/merge_request_pipeline.png b/doc/user/project/merge_requests/img/merge_request_pipeline.png deleted file mode 100644 index ce1d6bab536672dad2cac64c2d1d5024acd867f3..0000000000000000000000000000000000000000 Binary files a/doc/user/project/merge_requests/img/merge_request_pipeline.png and /dev/null differ diff --git a/doc/user/project/merge_requests/img/multiple_assignees_for_merge_requests_sidebar.png b/doc/user/project/merge_requests/img/multiple_assignees_for_merge_requests_sidebar.png deleted file mode 100644 index dde2680ed7424a1a69b46b3e1f135a335a3b022c..0000000000000000000000000000000000000000 Binary files a/doc/user/project/merge_requests/img/multiple_assignees_for_merge_requests_sidebar.png and /dev/null differ diff --git a/doc/user/project/merge_requests/img/mwps_v15_4.png b/doc/user/project/merge_requests/img/mwps_v15_4.png deleted file mode 100644 index f042912d470e6ace130405a2d05b770fb59b7acf..0000000000000000000000000000000000000000 Binary files a/doc/user/project/merge_requests/img/mwps_v15_4.png and /dev/null differ diff --git a/doc/user/project/merge_requests/img/post_merge_pipeline_v16_0.png b/doc/user/project/merge_requests/img/post_merge_pipeline_v16_0.png new file mode 100644 index 0000000000000000000000000000000000000000..b14ce645850e0ad0ec8e6997f640a449e4939592 Binary files /dev/null and b/doc/user/project/merge_requests/img/post_merge_pipeline_v16_0.png differ diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index b7467843e1dcba4980a1e1d69ff802791ecb816b..4090077ed4a23936ea3270c03f58b21af90d143d 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -93,6 +93,8 @@ or: 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. From the dropdown list, select the attribute you wish to filter by. Some examples: - [**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 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 -you can choose from: - - +you can choose from. -When filtering by `Deployed-before` or `Deployed-after`, 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 quoted if you wish to specify -both a date and time (`"YYYY-MM-DD HH:MM"`): +When filtering by `Deployed-before` or `Deployed-after`: - +- 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 @@ -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 accountable for it: - + 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: diff --git a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md index 6678bdd2ad0adc7d2f6abeb13548ba96da5aaa3c..19416972ae6f77961b26be38c17e708f12472d85 100644 --- a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md +++ b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md @@ -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 have to remember later to merge the work manually: - + 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**. diff --git a/doc/user/project/merge_requests/widgets.md b/doc/user/project/merge_requests/widgets.md index 6663e298a97224a37ac9e98d1a11063507171a7a..2c87aa4e1ddd29a0334bf1c8bfe4dbcb5ee0305c 100644 --- a/doc/user/project/merge_requests/widgets.md +++ b/doc/user/project/merge_requests/widgets.md @@ -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 disabled. If the pipeline fails to deploy, the deployment information is hidden. - + For more information, [read about pipelines](../../../ci/pipelines/index.md).