Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
779b1f7e
Commit
779b1f7e
authored
Sep 06, 2019
by
Russell Dickenson
Committed by
Marcia Ramos
Sep 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Docs: explain what is a diff
parent
78174ece
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
0 deletions
+22
-0
doc/user/admin_area/diff_limits.md
doc/user/admin_area/diff_limits.md
+2
-0
doc/user/project/merge_requests/img/merge_request_diff_v12_2.png
...r/project/merge_requests/img/merge_request_diff_v12_2.png
+0
-0
doc/user/project/merge_requests/index.md
doc/user/project/merge_requests/index.md
+20
-0
No files found.
doc/user/admin_area/diff_limits.md
View file @
779b1f7e
...
@@ -6,6 +6,8 @@ type: reference
...
@@ -6,6 +6,8 @@ type: reference
You can set a maximum size for display of diff files (patches).
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
## Maximum diff patch size
Diff files which exceed this value will be presented as 'too large' and won't
Diff files which exceed this value will be presented as 'too large' and won't
...
...
doc/user/project/merge_requests/img/merge_request_diff_v12_2.png
0 → 100644
View file @
779b1f7e
133 KB
doc/user/project/merge_requests/index.md
View file @
779b1f7e
...
@@ -164,6 +164,26 @@ you hide threads that are no longer relevant.
...
@@ -164,6 +164,26 @@ you hide threads that are no longer relevant.
[
Read more about resolving threads in merge requests reviews.
](
../../discussions/index.md
)
[
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
## Commenting on any file line in merge requests
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/13950) in GitLab 11.5.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/13950) in GitLab 11.5.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment