Skip to content
代码片段 群组 项目
提交 6bceee59 编辑于 作者: Russell Dickenson's avatar Russell Dickenson 提交者: Kati Paizee
浏览文件

Update navigation steps to match new navigation design - part 15

上级 56dfccd3
No related branches found
No related tags found
无相关合并请求
显示
92 个添加97 个删除
...@@ -157,8 +157,8 @@ rebases and file changes. ...@@ -157,8 +157,8 @@ rebases and file changes.
To add a comment to a merge request file: To add a comment to a merge request file:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Settings > Merge requests** and find your merge request. 1. Select **Code > Merge requests** and find your merge request.
1. Select **Changes**. 1. Select **Changes**.
1. In the header for the file you want to comment on, select **Comment** (**{comment}**). 1. In the header for the file you want to comment on, select **Comment** (**{comment}**).
......
...@@ -52,8 +52,8 @@ Commit `G` is added after the cherry-pick. ...@@ -52,8 +52,8 @@ Commit `G` is added after the cherry-pick.
After a merge request is merged, you can cherry-pick all changes introduced After a merge request is merged, you can cherry-pick all changes introduced
by the merge request: by the merge request:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests**, and find your merge request. 1. Select **Code > Merge requests**, and find your merge request.
1. Scroll to the merge request reports section, and find the **Merged by** report. 1. Scroll to the merge request reports section, and find the **Merged by** report.
1. In the upper-right corner, select **Cherry-pick**: 1. In the upper-right corner, select **Cherry-pick**:
...@@ -70,8 +70,8 @@ You can cherry-pick a single commit from multiple locations in your GitLab proje ...@@ -70,8 +70,8 @@ You can cherry-pick a single commit from multiple locations in your GitLab proje
To cherry-pick a commit from the list of all commits for a project: To cherry-pick a commit from the list of all commits for a project:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Repository > Commits**. 1. Select **Code > Commits**.
1. Select the [title](https://git-scm.com/docs/git-commit#_discussion) of the commit you want to cherry-pick. 1. Select the [title](https://git-scm.com/docs/git-commit#_discussion) of the commit you want to cherry-pick.
1. In the upper-right corner, select **Options > Cherry-pick** to show the cherry-pick modal. 1. In the upper-right corner, select **Options > Cherry-pick** to show the cherry-pick modal.
1. In the modal window, select the project and branch to cherry-pick into. 1. In the modal window, select the project and branch to cherry-pick into.
...@@ -84,8 +84,8 @@ You can cherry-pick commits from any merge request in your project, regardless o ...@@ -84,8 +84,8 @@ You can cherry-pick commits from any merge request in your project, regardless o
whether the merge request is open or closed. To cherry-pick a commit from the whether the merge request is open or closed. To cherry-pick a commit from the
list of commits included in a merge request: list of commits included in a merge request:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests**, and find your merge request. 1. Select **Code > Merge requests**, and find your merge request.
1. In the merge request's secondary menu, select **Commits** to display the commit details page. 1. In the merge request's secondary menu, select **Commits** to display the commit details page.
1. Select the [title](https://git-scm.com/docs/git-commit#_discussion) of the commit you want to cherry-pick. 1. Select the [title](https://git-scm.com/docs/git-commit#_discussion) of the commit you want to cherry-pick.
1. In the upper-right corner, select **Options > Cherry-pick** to show the cherry-pick modal. 1. In the upper-right corner, select **Options > Cherry-pick** to show the cherry-pick modal.
...@@ -98,8 +98,8 @@ list of commits included in a merge request: ...@@ -98,8 +98,8 @@ list of commits included in a merge request:
You can cherry-pick from the list of previous commits affecting an individual file You can cherry-pick from the list of previous commits affecting an individual file
when you view that file in your project's Git repository: when you view that file in your project's Git repository:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Repository > Files** and go to the file 1. Select **Code > Repository** and go to the file
changed by the commit. changed by the commit.
1. Select **History**, then select the [title](https://git-scm.com/docs/git-commit#_discussion) 1. Select **History**, then select the [title](https://git-scm.com/docs/git-commit#_discussion)
of the commit you want to cherry-pick. of the commit you want to cherry-pick.
......
...@@ -29,8 +29,8 @@ Prerequisite: ...@@ -29,8 +29,8 @@ Prerequisite:
To do this: To do this:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Settings > Merge requests**. 1. Select **Settings > Merge requests**.
1. Depending on the type of template you want to create, scroll to either 1. Depending on the type of template you want to create, scroll to either
[**Merge commit message template**](#default-template-for-merge-commits) or [**Merge commit message template**](#default-template-for-merge-commits) or
[**Squash commit message template**](#default-template-for-squash-commits). [**Squash commit message template**](#default-template-for-squash-commits).
......
...@@ -18,8 +18,8 @@ From this tab, you can review commit messages and copy a commit's SHA when you n ...@@ -18,8 +18,8 @@ From this tab, you can review commit messages and copy a commit's SHA when you n
To see the commits included in a merge request: To see the commits included in a merge request:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests**, then select your merge request. 1. Select **Code > Merge requests**, then select your merge request.
1. To show a list of the commits in the merge request, newest first, select **Commits** . 1. To show a list of the commits in the merge request, newest first, select **Commits** .
To read more about the commit, select **Toggle commit description** (**{ellipsis_h}**) To read more about the commit, select **Toggle commit description** (**{ellipsis_h}**)
on any commit. on any commit.
...@@ -48,8 +48,8 @@ if another merge request: ...@@ -48,8 +48,8 @@ if another merge request:
To add previously merged commits to a merge request for more context: To add previously merged commits to a merge request for more context:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests**, then select your merge request. 1. Select **Code > Merge requests**, then select your merge request.
1. Select **Commits**. 1. Select **Commits**.
1. Scroll to the end of the list of commits, and select **Add previously merged commits**. 1. Scroll to the end of the list of commits, and select **Add previously merged commits**.
1. Select the commits that you want to add. 1. Select the commits that you want to add.
...@@ -63,8 +63,8 @@ force push. ...@@ -63,8 +63,8 @@ force push.
To add discussion to a specific commit: To add discussion to a specific commit:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Repository > Commits**. 1. Select **Code > Commits**.
1. Below the commits, in the **Comment** field, enter a comment. 1. Below the commits, in the **Comment** field, enter a comment.
1. Save your comment as either a standalone comment, or a thread: 1. Save your comment as either a standalone comment, or a thread:
- To add a comment, select **Comment**. - To add a comment, select **Comment**.
...@@ -74,8 +74,8 @@ To add discussion to a specific commit: ...@@ -74,8 +74,8 @@ To add discussion to a specific commit:
To view the changes between previously merged commits: To view the changes between previously merged commits:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests**, then select your merge request. 1. Select **Code > Merge requests**, then select your merge request.
1. Select **Changes**. 1. Select **Changes**.
1. By **Compare** (**{file-tree}**), select the commits to compare: 1. By **Compare** (**{file-tree}**), select the commits to compare:
......
...@@ -59,8 +59,8 @@ in the user interface, and you can also resolve conflicts locally through the co ...@@ -59,8 +59,8 @@ in the user interface, and you can also resolve conflicts locally through the co
To resolve less-complex conflicts from the GitLab user interface: To resolve less-complex conflicts from the GitLab user interface:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests** and find the merge request. 1. Select **Code > Merge requests** and find the merge request.
1. Select **Overview**, and scroll to the merge request reports section. 1. Select **Overview**, and scroll to the merge request reports section.
1. Find the merge conflicts message, and select **Resolve conflicts**. 1. Find the merge conflicts message, and select **Resolve conflicts**.
GitLab shows a list of files with merge conflicts. The conflicts are GitLab shows a list of files with merge conflicts. The conflicts are
...@@ -84,8 +84,8 @@ Some merge conflicts are more complex, requiring you to manually modify lines to ...@@ -84,8 +84,8 @@ Some merge conflicts are more complex, requiring you to manually modify lines to
resolve their conflicts. Use the merge conflict resolution editor to resolve complex resolve their conflicts. Use the merge conflict resolution editor to resolve complex
conflicts in the GitLab interface: conflicts in the GitLab interface:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests** and find the merge request. 1. Select **Code > Merge requests** and find the merge request.
1. Select **Overview**, and scroll to the merge request reports section. 1. Select **Overview**, and scroll to the merge request reports section.
1. Find the merge conflicts message, and select **Resolve conflicts**. 1. Find the merge conflicts message, and select **Resolve conflicts**.
GitLab shows a list of files with merge conflicts. GitLab shows a list of files with merge conflicts.
......
...@@ -19,8 +19,8 @@ to streamline merge request creation. ...@@ -19,8 +19,8 @@ to streamline merge request creation.
You can create a merge request from the list of merge requests. You can create a merge request from the list of merge requests.
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left menu, select **Merge requests**. 1. Select **Code > Merge requests**.
1. In the upper-right corner, select **New merge request**. 1. In the upper-right corner, select **New merge request**.
1. Select a source and target branch and then **Compare branches and continue**. 1. Select a source and target branch and then **Compare branches and continue**.
1. Fill out the fields and select **Create merge request**. 1. Fill out the fields and select **Create merge request**.
...@@ -95,8 +95,8 @@ You can create a merge request when you add, edit, or upload a file to a reposit ...@@ -95,8 +95,8 @@ You can create a merge request when you add, edit, or upload a file to a reposit
You can create a merge request when you create a branch. You can create a merge request when you create a branch.
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left menu, select **Repository > Branches**. 1. Select **Code > Branches**.
1. Type a branch name and select **New branch**. 1. Type a branch name and select **New branch**.
1. Above the file list, on the right side, select **Create merge request**. 1. Above the file list, on the right side, select **Create merge request**.
A merge request is created. The default branch is the target. A merge request is created. The default branch is the target.
...@@ -142,9 +142,9 @@ to reduce the need for editing merge requests manually through the UI. ...@@ -142,9 +142,9 @@ to reduce the need for editing merge requests manually through the UI.
You can create a merge request from your fork to contribute back to the main project. You can create a merge request from your fork to contribute back to the main project.
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. Select your fork of the repository. 1. Select your fork of the repository.
1. On the left menu, go to **Merge requests**, and select **New merge request**. 1. On the left sidebar, select **Code > Merge requests**, and select **New merge request**.
1. In the **Source branch** dropdown list box, select the branch in your forked repository as the source branch. 1. In the **Source branch** dropdown list box, select the branch in your forked repository as the source branch.
1. In the **Target branch** dropdown list box, select the branch from the upstream repository as the target branch. 1. In the **Target branch** dropdown list box, select the branch from the upstream repository as the target branch.
You can set a [default target project](#set-the-default-target-project) to You can set a [default target project](#set-the-default-target-project) to
...@@ -171,8 +171,8 @@ Prerequisites: ...@@ -171,8 +171,8 @@ Prerequisites:
To create a merge request by sending an email: To create a merge request by sending an email:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left menu, select **Merge requests**. 1. Select **Code > Merge requests**.
1. In the upper-right corner, select **Email a new merge request to this project**. 1. In the upper-right corner, select **Email a new merge request to this project**.
An email address is displayed. Copy this address. An email address is displayed. Copy this address.
Ensure you keep this address private. Ensure you keep this address private.
...@@ -216,8 +216,8 @@ scenarios when you create a new merge request: ...@@ -216,8 +216,8 @@ scenarios when you create a new merge request:
To have merge requests from a fork by default target your own fork To have merge requests from a fork by default target your own fork
(instead of the upstream project), you can change the default. (instead of the upstream project), you can change the default.
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left menu, select **Settings > General > Merge requests**. 1. Select **Settings > Merge requests**.
1. In the **Target project** section, select the option you want to use for 1. In the **Target project** section, select the option you want to use for
your default target project. your default target project.
1. Select **Save changes**. 1. Select **Save changes**.
...@@ -12,8 +12,8 @@ Export all the data collected from a project's merge requests into a comma-separ ...@@ -12,8 +12,8 @@ Export all the data collected from a project's merge requests into a comma-separ
To export merge requests to a CSV file: To export merge requests to a CSV file:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests** . 1. Select **Code > Merge requests**.
1. Add any searches or filters. This can help you keep the size of the CSV file under the 15 MB limit. The limit ensures 1. Add any searches or filters. This can help you keep the size of the CSV file under the 15 MB limit. The limit ensures
the file can be emailed to a variety of email providers. the file can be emailed to a variety of email providers.
1. Select **Actions** (**{ellipsis_v}**) **> Export as CSV**. 1. Select **Actions** (**{ellipsis_v}**) **> Export as CSV**.
......
...@@ -57,8 +57,8 @@ information about the dependency: ...@@ -57,8 +57,8 @@ information about the dependency:
To view dependency information on a merge request: To view dependency information on a merge request:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests** and identify your merge request. 1. Select **Code > Merge requests** and identify your merge request.
1. Scroll to the merge request reports area. Dependent merge requests display information 1. Scroll to the merge request reports area. Dependent merge requests display information
about the total number of dependencies set, such as about the total number of dependencies set, such as
**(status-warning)** **Depends on 1 merge request being merged**. **(status-warning)** **Depends on 1 merge request being merged**.
...@@ -105,8 +105,8 @@ Prerequisite: ...@@ -105,8 +105,8 @@ Prerequisite:
To do this: To do this:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests** and identify your merge request. 1. Select **Code > Merge requests** and identify your merge request.
1. Select **Edit**. 1. Select **Edit**.
1. In **Merge request dependencies**, paste either the reference or the full URL 1. In **Merge request dependencies**, paste either the reference or the full URL
to the merge requests that should merge before this work merges. References to the merge requests that should merge before this work merges. References
...@@ -120,8 +120,8 @@ Prerequisite: ...@@ -120,8 +120,8 @@ Prerequisite:
- You must have a role in the project that allows you to edit merge requests. - You must have a role in the project that allows you to edit merge requests.
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests** and identify your merge request. 1. Select **Code > Merge requests** and identify your merge request.
1. Select **Edit**. 1. Select **Edit**.
1. Scroll to **Merge request dependencies** and select **Remove** next to the reference 1. Scroll to **Merge request dependencies** and select **Remove** next to the reference
for each dependency you want to remove. for each dependency you want to remove.
......
...@@ -50,8 +50,8 @@ You can view merge requests for your project, group, or yourself. ...@@ -50,8 +50,8 @@ You can view merge requests for your project, group, or yourself.
To view all merge requests for a project: To view all merge requests for a project:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests**. 1. Select **Code > Merge requests**.
Or, to use a [keyboard shortcut](../../shortcuts.md), press <kbd>g</kbd> + <kbd>m</kbd>. Or, to use a [keyboard shortcut](../../shortcuts.md), press <kbd>g</kbd> + <kbd>m</kbd>.
...@@ -59,8 +59,8 @@ Or, to use a [keyboard shortcut](../../shortcuts.md), press <kbd>g</kbd> + <kbd> ...@@ -59,8 +59,8 @@ Or, to use a [keyboard shortcut](../../shortcuts.md), press <kbd>g</kbd> + <kbd>
To view merge requests for all projects in a group: To view merge requests for all projects in a group:
1. On the top bar, select **Main menu > Groups** and find your group. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your group.
1. On the left sidebar, select **Merge requests**. 1. Select **Code > Merge requests**.
If your group contains subgroups, this view also displays merge requests from the subgroup projects. If your group contains subgroups, this view also displays merge requests from the subgroup projects.
...@@ -68,21 +68,17 @@ If your group contains subgroups, this view also displays merge requests from th ...@@ -68,21 +68,17 @@ If your group contains subgroups, this view also displays merge requests from th
To view all merge requests assigned to you: To view all merge requests assigned to you:
<!-- vale gitlab.FirstPerson = NO --> 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**).
1. On the top bar, put your cursor in the **Search** box.
1. From the dropdown list, select **Merge requests assigned to me**. 1. From the dropdown list, select **Merge requests assigned to me**.
<!-- vale gitlab.FirstPerson = YES -->
or: or:
- To use a [keyboard shortcut](../../shortcuts.md), press <kbd>Shift</kbd> + <kbd>m</kbd>. - To use a [keyboard shortcut](../../shortcuts.md), press <kbd>Shift</kbd> + <kbd>m</kbd>.
or: or:
1. On the top bar, in the upper-right corner, select **Merge requests** (**{merge-request-open}**). 1. On the left sidebar, at the top, select **Merge requests** (**{merge-request}**).
1. From the dropdown list, select **Assigned to you**. 1. From the dropdown list, select **Assigned**.
## Filter the list of merge requests ## Filter the list of merge requests
...@@ -93,8 +89,8 @@ or: ...@@ -93,8 +89,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, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests**. 1. Select **Code > 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).
...@@ -167,8 +163,8 @@ To assign the merge request to a user, use the `/assign @user` ...@@ -167,8 +163,8 @@ To assign the merge request to a user, use the `/assign @user`
[quick action](../quick_actions.md#issues-merge-requests-and-epics) in a text area in [quick action](../quick_actions.md#issues-merge-requests-and-epics) in a text area in
a merge request, or: a merge request, or:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests** and find your merge request. 1. Select **Code > Merge requests** and find your merge request.
1. On the right sidebar, expand the right sidebar and locate the **Assignees** section. 1. On the right sidebar, expand the right sidebar and locate the **Assignees** section.
1. Select **Edit**. 1. Select **Edit**.
1. Search for the user you want to assign, and select the user. 1. Search for the user you want to assign, and select the user.
...@@ -187,8 +183,8 @@ accountable for it: ...@@ -187,8 +183,8 @@ accountable for it:
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:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests** and find your merge request. 1. Select **Code > Merge requests** and find your merge request.
1. On the right sidebar, expand the right sidebar and locate the **Assignees** section. 1. On the right sidebar, expand the right sidebar and locate the **Assignees** section.
1. Select **Edit** and, from the dropdown list, select all users you want 1. Select **Edit** and, from the dropdown list, select all users you want
to assign the merge request to. to assign the merge request to.
...@@ -327,8 +323,8 @@ On GitLab.com, this feature is enabled for GitLab team members only. ...@@ -327,8 +323,8 @@ On GitLab.com, this feature is enabled for GitLab team members only.
To understand the history of a merge request, filter its activity feed to show you To understand the history of a merge request, filter its activity feed to show you
only the items that are relevant to you. only the items that are relevant to you.
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests**. 1. Select **Code > Merge requests**.
1. Select a merge request. 1. Select a merge request.
1. Scroll to **Activity**. 1. Scroll to **Activity**.
1. On the right side of the page, select **Activity filter** to show the filter options. 1. On the right side of the page, select **Activity filter** to show the filter options.
...@@ -405,8 +401,8 @@ You can prevent merge requests from being merged until all threads are ...@@ -405,8 +401,8 @@ You can prevent merge requests from being merged until all threads are
resolved. When this setting is enabled, the **Unresolved threads** counter in a merge request resolved. When this setting is enabled, the **Unresolved threads** counter in a merge request
is shown in orange when at least one thread remains unresolved. is shown in orange when at least one thread remains unresolved.
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Settings > Merge requests**. 1. Select **Settings > Merge requests**.
1. In the **Merge checks** section, select the **All threads must be resolved** checkbox. 1. In the **Merge checks** section, select the **All threads must be resolved** checkbox.
1. Select **Save changes**. 1. Select **Save changes**.
...@@ -415,8 +411,8 @@ is shown in orange when at least one thread remains unresolved. ...@@ -415,8 +411,8 @@ is shown in orange when at least one thread remains unresolved.
You can set merge requests to automatically resolve threads when lines are modified You can set merge requests to automatically resolve threads when lines are modified
with a new push. with a new push.
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Settings > Merge requests**. 1. Select **Settings > Merge requests**.
1. In the **Merge options** section, select 1. In the **Merge options** section, select
**Automatically resolve merge request diff threads when they become outdated**. **Automatically resolve merge request diff threads when they become outdated**.
1. Select **Save changes**. 1. Select **Save changes**.
......
...@@ -39,8 +39,8 @@ To do this when pushing from the command line, use the `merge_request.merge_when ...@@ -39,8 +39,8 @@ To do this when pushing from the command line, use the `merge_request.merge_when
To do this from the GitLab user interface: To do this from the GitLab user interface:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests**. 1. Select **Code > Merge requests**.
1. Scroll to the merge request reports section. 1. Scroll to the merge request reports section.
1. Optional. Select your desired merge options, such as **Delete source branch**, 1. Optional. Select your desired merge options, such as **Delete source branch**,
**Squash commits**, or **Edit commit message**. **Squash commits**, or **Edit commit message**.
...@@ -62,8 +62,8 @@ Prerequisites: ...@@ -62,8 +62,8 @@ Prerequisites:
To do this: To do this:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests**. 1. Select **Code > Merge requests**.
1. Scroll to the merge request reports section. 1. Scroll to the merge request reports section.
1. Select **Cancel auto-merge**. 1. Select **Cancel auto-merge**.
...@@ -88,8 +88,8 @@ Prerequisites: ...@@ -88,8 +88,8 @@ Prerequisites:
To enable this setting: To enable this setting:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Settings > Merge requests**. 1. Select **Settings > Merge requests**.
1. Scroll to **Merge checks**, and select **Pipelines must succeed**. 1. Scroll to **Merge checks**, and select **Pipelines must succeed**.
This setting also prevents merge requests from being merged if there is no pipeline, This setting also prevents merge requests from being merged if there is no pipeline,
which can [conflict with some rules](#merge-requests-dont-merge-when-successful-pipeline-is-required). which can [conflict with some rules](#merge-requests-dont-merge-when-successful-pipeline-is-required).
...@@ -109,9 +109,8 @@ Prerequisite: ...@@ -109,9 +109,8 @@ Prerequisite:
To change this behavior: To change this behavior:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Settings > General**. 1. Select **Settings > Merge requests**.
1. Expand **Merge requests**.
1. Under **Merge checks**: 1. Under **Merge checks**:
- Select **Pipelines must succeed**. - Select **Pipelines must succeed**.
- Select **Skipped pipelines are considered successful**. - Select **Skipped pipelines are considered successful**.
......
...@@ -26,8 +26,8 @@ gitGraph ...@@ -26,8 +26,8 @@ gitGraph
## Configure a project's merge method ## Configure a project's merge method
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Settings > Merge requests**. 1. Select **Settings > Merge requests**.
1. Select your desired **Merge method** from these options: 1. Select your desired **Merge method** from these options:
- Merge commit - Merge commit
- Merge commit with semi-linear history - Merge commit with semi-linear history
......
...@@ -30,8 +30,8 @@ Prerequisites: ...@@ -30,8 +30,8 @@ Prerequisites:
To do this: To do this:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests** and identify your merge request. 1. Select **Code > Merge requests** and identify your merge request.
1. Scroll to the merge request reports area, and find the report showing when the 1. Scroll to the merge request reports area, and find the report showing when the
merge request was merged. merge request was merged.
1. Select **Revert**. 1. Select **Revert**.
...@@ -55,13 +55,13 @@ Prerequisites: ...@@ -55,13 +55,13 @@ Prerequisites:
To do this: To do this:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. If you know the merge request that contains the commit: 1. If you know the merge request that contains the commit:
1. On the left sidebar, select **Merge requests** and identify your merge request. 1. Select **Code > Merge requests**, then identify and select your merge request.
1. Select **Commits**, then select the title of the commit you want to revert. This displays the commit in the **Changes** tab of your merge request. 1. Select **Commits**, then select the title of the commit you want to revert. This displays the commit in the **Changes** tab of your merge request.
1. Select the commit hash you want to revert. GitLab displays the contents of the commit. 1. Select the commit hash you want to revert. GitLab displays the contents of the commit.
1. If you don't know the merge request the commit originated from: 1. If you don't know the merge request the commit originated from:
1. On the left sidebar, select **Repository > Commits**. 1. Select **Code > Commits**.
1. Select the title of the commit to display full information about the commit. 1. Select the title of the commit to display full information about the commit.
1. In the upper-right corner, select **Options**, then select **Revert**. 1. In the upper-right corner, select **Options**, then select **Revert**.
1. In **Revert in branch**, select the branch to revert your changes into. 1. In **Revert in branch**, select the branch to revert your changes into.
......
...@@ -77,8 +77,8 @@ displays next to your name. ...@@ -77,8 +77,8 @@ displays next to your name.
To download the changes included in a merge request as a diff: To download the changes included in a merge request as a diff:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests**. 1. Select **Code > Merge requests**.
1. Select your merge request. 1. Select your merge request.
1. In the upper-right corner, select **Code > Plain diff**. 1. In the upper-right corner, select **Code > Plain diff**.
...@@ -100,8 +100,8 @@ curl "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/000000.diff" | git a ...@@ -100,8 +100,8 @@ curl "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/000000.diff" | git a
To download the changes included in a merge request as a patch file: To download the changes included in a merge request as a patch file:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests**. 1. Select **Code > Merge requests**.
1. Select your merge request. 1. Select your merge request.
1. In the upper-right corner, select **Code > Patches**. 1. In the upper-right corner, select **Code > Patches**.
......
...@@ -17,8 +17,8 @@ merge request, authored by the user who suggested the changes. ...@@ -17,8 +17,8 @@ merge request, authored by the user who suggested the changes.
## Create suggestions ## Create suggestions
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests** and find your merge request. 1. Select **Code > Merge requests** and find your merge request.
1. On the secondary menu, select **Changes**. 1. On the secondary menu, select **Changes**.
1. Find the lines of code you want to change. 1. Find the lines of code you want to change.
- To select a single line: - To select a single line:
...@@ -80,8 +80,8 @@ Prerequisites: ...@@ -80,8 +80,8 @@ Prerequisites:
To apply suggested changes directly from the merge request: To apply suggested changes directly from the merge request:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests** and find your merge request. 1. Select **Code > Merge requests** and find your merge request.
1. Find the comment containing the suggestion you want to apply. 1. Find the comment containing the suggestion you want to apply.
- To apply suggestions individually, select **Apply suggestion**. - To apply suggestions individually, select **Apply suggestion**.
- To apply multiple suggestions in a single commit, select **Add suggestion to batch**. - To apply multiple suggestions in a single commit, select **Add suggestion to batch**.
...@@ -128,8 +128,8 @@ Merge requests created from forks use the template defined in the target project ...@@ -128,8 +128,8 @@ Merge requests created from forks use the template defined in the target project
To meet your project's needs, you can customize these messages and include other To meet your project's needs, you can customize these messages and include other
placeholder variables: placeholder variables:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Settings > Merge requests**. 1. Select **Settings > Merge requests**.
1. Scroll to **Merge suggestions**, and alter the text to meet your needs. 1. Scroll to **Merge suggestions**, and alter the text to meet your needs.
See [Supported variables](#supported-variables) for a list of placeholders See [Supported variables](#supported-variables) for a list of placeholders
you can use in this message. you can use in this message.
...@@ -163,8 +163,8 @@ For example, to customize the commit message to output ...@@ -163,8 +163,8 @@ For example, to customize the commit message to output
To reduce the number of commits added to your branch, you can apply multiple To reduce the number of commits added to your branch, you can apply multiple
suggestions in a single commit. suggestions in a single commit.
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Merge requests** and find your merge request. 1. Select **Code > Merge requests** and find your merge request.
1. For each suggestion you want to apply, and select **Add suggestion to batch**. 1. For each suggestion you want to apply, and select **Add suggestion to batch**.
1. Optional. To remove a suggestion, select **Remove from batch**. 1. Optional. To remove a suggestion, select **Remove from batch**.
1. After you add your desired suggestions, select **Apply suggestions**. 1. After you add your desired suggestions, select **Apply suggestions**.
......
...@@ -71,8 +71,8 @@ Prerequisites: ...@@ -71,8 +71,8 @@ Prerequisites:
To configure the default squashing behavior for all merge requests in your project: To configure the default squashing behavior for all merge requests in your project:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Settings > Merge requests**. 1. Select **Settings > Merge requests**.
1. In the **Squash commits when merging** section, select your desired behavior: 1. In the **Squash commits when merging** section, select your desired behavior:
- **Do not allow**: Squashing is never performed, and the option is not displayed. - **Do not allow**: Squashing is never performed, and the option is not displayed.
- **Allow**: Squashing is allowed, but cleared by default. - **Allow**: Squashing is allowed, but cleared by default.
......
...@@ -36,8 +36,8 @@ see [epic 3869](https://gitlab.com/groups/gitlab-org/-/epics/3869). ...@@ -36,8 +36,8 @@ see [epic 3869](https://gitlab.com/groups/gitlab-org/-/epics/3869).
By default, merge requests in projects can be merged even if external status checks fail. To block the merging of merge requests when external checks fail: By default, merge requests in projects can be merged even if external status checks fail. To block the merging of merge requests when external checks fail:
1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
1. On the left sidebar, select **Settings > Merge requests**. 1. Select **Settings > Merge requests**.
1. Select the **Status checks must succeed** checkbox. 1. Select the **Status checks must succeed** checkbox.
1. Select **Save changes**. 1. Select **Save changes**.
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册