Merge branch 'docs/add_file_diff_description' into 'master'
Docs: explain what is a diff Closes #62072 See merge request gitlab-org/gitlab-ce!32560
This commit is contained in:
commit
bc06e9cd7e
3 changed files with 22 additions and 0 deletions
|
@ -6,6 +6,8 @@ type: reference
|
|||
|
||||
You can set a maximum size for display of diff files (patches).
|
||||
|
||||
For details about diff files, [View changes between files](../project/merge_requests/index.md#view-changes-between-file-versions).
|
||||
|
||||
## Maximum diff patch size
|
||||
|
||||
Diff files which exceed this value will be presented as 'too large' and won't
|
||||
|
|
BIN
doc/user/project/merge_requests/img/merge_request_diff_v12_2.png
Normal file
BIN
doc/user/project/merge_requests/img/merge_request_diff_v12_2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 133 KiB |
|
@ -164,6 +164,26 @@ you hide threads that are no longer relevant.
|
|||
|
||||
[Read more about resolving threads in merge requests reviews.](../../discussions/index.md)
|
||||
|
||||
## View changes between file versions
|
||||
|
||||
The **Changes** tab of a merge request shows the changes to files between branches or
|
||||
commits. This view of changes to a file is also known as a **diff**. By default, the diff view
|
||||
compares the file in the merge request branch and the file in the target branch.
|
||||
|
||||
The diff view includes the following:
|
||||
|
||||
- The file's name and path.
|
||||
- The number of lines added and deleted.
|
||||
- Buttons for the following options:
|
||||
- Toggle comments for this file; useful for inline reviews.
|
||||
- Edit the file in the merge request's branch.
|
||||
- Show full file, in case you want to look at the changes in context with the rest of the file.
|
||||
- View file at the current commit.
|
||||
- Preview the changes with [Review Apps](../../../ci/review_apps/index.md).
|
||||
- The changed lines, with the specific changes highlighted.
|
||||
|
||||
![Example screenshot of a source code diff](img/merge_request_diff_v12_2.png)
|
||||
|
||||
## Commenting on any file line in merge requests
|
||||
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/13950) in GitLab 11.5.
|
||||
|
|
Loading…
Reference in a new issue