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
0aee3755
Commit
0aee3755
authored
Sep 04, 2018
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add notes to diff docs regarding limits
parent
d73541d0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
doc/development/diffs.md
doc/development/diffs.md
+9
-0
No files found.
doc/development/diffs.md
View file @
0aee3755
...
@@ -95,6 +95,8 @@ Gitlab::Git::DiffCollection.collection_limits[:max_bytes] = Gitlab::Git::DiffCol
...
@@ -95,6 +95,8 @@ Gitlab::Git::DiffCollection.collection_limits[:max_bytes] = Gitlab::Git::DiffCol
No more files will be rendered at all if 5 megabytes have already been rendered.
No more files will be rendered at all if 5 megabytes have already been rendered.
*Note:*
All collection limit parameters are currently sent and applied on Gitaly. That is, once the limit is surpassed,
Gitaly will only return the safe amount of data to be persisted on
`merge_request_diff_files`
.
### Individual diff file limits
### Individual diff file limits
...
@@ -106,12 +108,17 @@ Gitlab::Git::Diff::COLLAPSE_LIMIT = 10.kilobytes
...
@@ -106,12 +108,17 @@ Gitlab::Git::Diff::COLLAPSE_LIMIT = 10.kilobytes
File diff will be collapsed (but be expandable) if it is larger than 10 kilobytes.
File diff will be collapsed (but be expandable) if it is larger than 10 kilobytes.
*Note:*
Although this nomenclature (Collapsing) is also used on Gitaly, this limit is only used on GitLab (hardcoded - not sent to Gitaly).
Gitaly will only return
`Diff.Collapsed`
(RPC) when surpassing collection limits.
```
ruby
```
ruby
Gitlab
::
Git
::
Diff
::
SIZE_LIMIT
=
100
.
kilobytes
Gitlab
::
Git
::
Diff
::
SIZE_LIMIT
=
100
.
kilobytes
```
```
File diff will not be rendered if it's larger than 100 kilobytes.
File diff will not be rendered if it's larger than 100 kilobytes.
*Note:*
This limit is currently hardcoded and applied on Gitaly and the RPC returns
`Diff.TooLarge`
when this limit is surpassed.
Although we're still also applying it on GitLab, we should remove the redundancy from GitLab once we're confident with the Gitaly integration.
```
ruby
```
ruby
Commit
::
DIFF_SAFE_LINES
=
Gitlab
::
Git
::
DiffCollection
::
DEFAULT_LIMITS
[
:max_lines
]
=
5000
Commit
::
DIFF_SAFE_LINES
=
Gitlab
::
Git
::
DiffCollection
::
DEFAULT_LIMITS
[
:max_lines
]
=
5000
...
@@ -119,6 +126,8 @@ Commit::DIFF_SAFE_LINES = Gitlab::Git::DiffCollection::DEFAULT_LIMITS[:max_lines
...
@@ -119,6 +126,8 @@ Commit::DIFF_SAFE_LINES = Gitlab::Git::DiffCollection::DEFAULT_LIMITS[:max_lines
File diff will be suppressed (technically different from collapsed, but behaves the same, and is expandable) if it has more than 5000 lines.
File diff will be suppressed (technically different from collapsed, but behaves the same, and is expandable) if it has more than 5000 lines.
*Note:*
This limit is currently hardcoded and only applied on GitLab.
## Viewers
## Viewers
Diff Viewers, which can be found on
`models/diff_viewer/*`
are classes used to map metadata about each type of Diff File. It has information
Diff Viewers, which can be found on
`models/diff_viewer/*`
are classes used to map metadata about each type of Diff File. It has information
...
...
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