Commit 48878e18 authored by Craig Norris's avatar Craig Norris

Merge branch 'docs-aqualls-future-tense-code-review' into 'master'

Clean up future tense in Code Review docs

See merge request gitlab-org/gitlab!55925
parents 13024982 841f7cc4
...@@ -1064,7 +1064,7 @@ POST /projects/:id/merge_requests ...@@ -1064,7 +1064,7 @@ POST /projects/:id/merge_requests
| `title` | string | yes | Title of MR. | | `title` | string | yes | Title of MR. |
| `assignee_id` | integer | no | Assignee user ID. | | `assignee_id` | integer | no | Assignee user ID. |
| `assignee_ids` | integer array | no | The ID of the user(s) to assign the MR to. Set to `0` or provide an empty value to unassign all assignees. | | `assignee_ids` | integer array | no | The ID of the user(s) to assign the MR to. Set to `0` or provide an empty value to unassign all assignees. |
| `reviewer_ids` | integer array | no | The ID of the user(s) added as a reviewer to the MR. If set to `0` or left empty, there will be no reviewers added. | | `reviewer_ids` | integer array | no | The ID of the user(s) added as a reviewer to the MR. If set to `0` or left empty, no reviewers are added. |
| `description` | string | no | Description of MR. Limited to 1,048,576 characters. | | `description` | string | no | Description of MR. Limited to 1,048,576 characters. |
| `target_project_id` | integer | no | The target project (numeric ID). | | `target_project_id` | integer | no | The target project (numeric ID). |
| `labels` | string | no | Labels for MR as a comma-separated list. | | `labels` | string | no | Labels for MR as a comma-separated list. |
......
This diff is collapsed.
...@@ -25,7 +25,7 @@ You can automate this feature in your applications by using [Auto DevOps](../../ ...@@ -25,7 +25,7 @@ You can automate this feature in your applications by using [Auto DevOps](../../
## Configuration ## Configuration
Enable code intelligence for a project by adding a GitLab CI/CD job to the project's Enable code intelligence for a project by adding a GitLab CI/CD job to the project's
`.gitlab-ci.yml` which will generate the LSIF artifact: `.gitlab-ci.yml` which generates the LSIF artifact:
```yaml ```yaml
code_navigation: code_navigation:
......
...@@ -18,15 +18,15 @@ This feature is available for merge requests across forked projects that are ...@@ -18,15 +18,15 @@ This feature is available for merge requests across forked projects that are
publicly accessible. publicly accessible.
When enabled for a merge request, members with merge access to the target When enabled for a merge request, members with merge access to the target
branch of the project will be granted write permissions to the source branch branch of the project is granted write permissions to the source branch
of the merge request. of the merge request.
## Enabling commit edits from upstream members ## Enabling commit edits from upstream members
In [GitLab 13.7 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/23308), In [GitLab 13.7 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/23308),
this setting is enabled by default. It can be changed by users with Developer this setting is enabled by default. It can be changed by users with Developer
permissions to the source project. Once enabled, upstream members will also be permissions to the source project. Once enabled, upstream members can
able to retry the pipelines and jobs of the merge request: retry the pipelines and jobs of the merge request:
1. While creating or editing a merge request, select the checkbox **Allow 1. While creating or editing a merge request, select the checkbox **Allow
commits from members who can merge to the target branch**. commits from members who can merge to the target branch**.
...@@ -64,7 +64,7 @@ Here's how the process would look like: ...@@ -64,7 +64,7 @@ Here's how the process would look like:
git checkout -b thedude-awesome-project-update-docs FETCH_HEAD git checkout -b thedude-awesome-project-update-docs FETCH_HEAD
``` ```
This will fetch the branch of the forked project and then create a local branch This fetches the branch of the forked project and then create a local branch
based off the fetched branch. based off the fetched branch.
1. Make any changes you want and commit. 1. Make any changes you want and commit.
...@@ -74,7 +74,7 @@ Here's how the process would look like: ...@@ -74,7 +74,7 @@ Here's how the process would look like:
git push git@gitlab.com:thedude/awesome-project.git thedude-awesome-project-update-docs:update-docs git push git@gitlab.com:thedude/awesome-project.git thedude-awesome-project-update-docs:update-docs
``` ```
Note the colon (`:`) between the two branches. The above command will push the Note the colon (`:`) between the two branches. The above command pushes the
local branch `thedude-awesome-project-update-docs` to the local branch `thedude-awesome-project-update-docs` to the
`update-docs` branch of the `git@gitlab.com:thedude/awesome-project.git` repository. `update-docs` branch of the `git@gitlab.com:thedude/awesome-project.git` repository.
......
...@@ -84,7 +84,7 @@ See also other [features associated to merge requests](reviewing_and_managing_me ...@@ -84,7 +84,7 @@ See also other [features associated to merge requests](reviewing_and_managing_me
Choose an assignee to designate someone as the person responsible Choose an assignee to designate someone as the person responsible
for the first [review of the merge request](reviewing_and_managing_merge_requests.md). for the first [review of the merge request](reviewing_and_managing_merge_requests.md).
Open the drop down box to search for the user you wish to assign, Open the drop down box to search for the user you wish to assign,
and the merge request will be added to their and the merge request is added to their
[assigned merge request list](../../search/index.md#issues-and-merge-requests). [assigned merge request list](../../search/index.md#issues-and-merge-requests).
#### Multiple assignees **(PREMIUM)** #### Multiple assignees **(PREMIUM)**
......
...@@ -7,8 +7,8 @@ type: index, reference ...@@ -7,8 +7,8 @@ type: index, reference
# Merge requests **(FREE)** # Merge requests **(FREE)**
Whenever you need to merge one branch into another branch with GitLab, you'll Whenever you need to merge one branch into another branch with GitLab, you
need to create a merge request (MR). must create a merge request (MR).
Using merge requests, you can visualize and collaborate on proposed changes to Using merge requests, you can visualize and collaborate on proposed changes to
source code. Merge requests display information about the proposed code changes, source code. Merge requests display information about the proposed code changes,
......
...@@ -84,7 +84,7 @@ merge request widget: ...@@ -84,7 +84,7 @@ merge request widget:
![Dependencies in merge request widget](img/dependencies_view_v12_2.png) ![Dependencies in merge request widget](img/dependencies_view_v12_2.png)
Until all dependencies have, themselves, been merged, the **Merge** Until all dependencies have, themselves, been merged, the **Merge**
button will be disabled for the dependent merge request. In button is disabled for the dependent merge request. In
particular, note that **closed merge requests** still prevent their particular, note that **closed merge requests** still prevent their
dependents from being merged - it is impossible to automatically dependents from being merged - it is impossible to automatically
determine whether the dependency expressed by a closed merge request determine whether the dependency expressed by a closed merge request
......
...@@ -13,27 +13,26 @@ by clicking the **Revert** button in merge requests and commit details. ...@@ -13,27 +13,26 @@ by clicking the **Revert** button in merge requests and commit details.
## Reverting a merge request ## Reverting a merge request
NOTE: NOTE:
The **Revert** button will only be available for merge requests The **Revert** button is available only for merge requests
created in GitLab 8.5 and later. However, you can still revert a merge request created in GitLab 8.5 and later. However, you can still revert a merge request
by reverting the merge commit from the list of Commits page. by reverting the merge commit from the list of Commits page.
NOTE: NOTE:
The **Revert** button will only be shown for projects that use the The **Revert** button is shown only for projects that use the
merge method "Merge Commit", which can be set under the project's merge method "Merge Commit", which can be set under the project's
**Settings > General > Merge request**. [Fast-forward commits](fast_forward_merge.md) **Settings > General > Merge request**. [Fast-forward commits](fast_forward_merge.md)
can not be reverted via the MR view. can not be reverted by using the merge request view.
After the Merge Request has been merged, a **Revert** button will be available After the merge request has been merged, use the **Revert** button
to revert the changes introduced by that merge request. to revert the changes introduced by that merge request.
![Revert Merge Request](img/cherry_pick_changes_mr.png) ![Revert merge request](img/cherry_pick_changes_mr.png)
After you click that button, a modal will appear where you can choose to After you click that button, a modal appears where you can choose to
revert the changes directly into the selected branch or you can opt to revert the changes directly into the selected branch or you can opt to
create a new merge request with the revert changes. create a new merge request with the revert changes.
After the merge request has been reverted, the **Revert** button will not be After the merge request has been reverted, the **Revert** button is no longer available.
available anymore.
## Reverting a commit ## Reverting a commit
...@@ -45,14 +44,13 @@ Similar to reverting a merge request, you can opt to revert the changes ...@@ -45,14 +44,13 @@ Similar to reverting a merge request, you can opt to revert the changes
directly into the target branch or create a new merge request to revert the directly into the target branch or create a new merge request to revert the
changes. changes.
After the commit has been reverted, the **Revert** button will not be available After a commit is reverted, the **Revert** button is no longer available.
anymore.
Please note that when reverting merge commits, the mainline will always be the When reverting merge commits, the mainline is always the
first parent. If you want to use a different mainline then you need to do that first parent. If you want to use a different mainline, you need to do that
from the command line. from the command line.
Here is a quick example to revert a merge commit using the second parent as the Here's an example to revert a merge commit using the second parent as the
mainline: mainline:
```shell ```shell
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment