diff options
| author | Russell Dickenson <rdickenson@gitlab.com> | 2019-09-03 09:55:15 +1000 |
|---|---|---|
| committer | Russell Dickenson <rdickenson@gitlab.com> | 2019-09-06 12:51:53 +1000 |
| commit | 86cbb6678c87a2a2eca256a6bfddad67ff5a496c (patch) | |
| tree | d8d1011f6fa7ea019766ce8fffc6b28fcab1f70c | |
| parent | 407132bfd4f52b392a64c81eeacf51717d9c3248 (diff) | |
| download | gitlab-ce-docs/add_file_diff_description.tar.gz | |
Added description of `diff` viewdocs/add_file_diff_description
| -rw-r--r-- | doc/user/admin_area/diff_limits.md | 2 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/img/merge_request_diff_v12_2.png | bin | 0 -> 136144 bytes | |||
| -rw-r--r-- | doc/user/project/merge_requests/index.md | 20 |
3 files changed, 22 insertions, 0 deletions
diff --git a/doc/user/admin_area/diff_limits.md b/doc/user/admin_area/diff_limits.md index 9fe4b50a991..5117b5f476f 100644 --- a/doc/user/admin_area/diff_limits.md +++ b/doc/user/admin_area/diff_limits.md @@ -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 diff --git a/doc/user/project/merge_requests/img/merge_request_diff_v12_2.png b/doc/user/project/merge_requests/img/merge_request_diff_v12_2.png Binary files differnew file mode 100644 index 00000000000..e56fbb9750f --- /dev/null +++ b/doc/user/project/merge_requests/img/merge_request_diff_v12_2.png diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index d6da8cb99c7..9b341fdf439 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -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 MR 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 current commit. + - Preview the changes with [Review Apps](../../../ci/review_apps/index.md). +- The changed lines, with the specific changes highlighted. + + + ## Commenting on any file line in merge requests > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/13950) in GitLab 11.5. |
