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
ddaa445e
Commit
ddaa445e
authored
Aug 28, 2020
by
jboyson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix usage of MAX_LINES_TO_BE_RENDERED
parent
a7e0fc7f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
app/assets/javascripts/diffs/constants.js
app/assets/javascripts/diffs/constants.js
+0
-1
app/assets/javascripts/diffs/store/utils.js
app/assets/javascripts/diffs/store/utils.js
+0
-3
changelogs/unreleased/jdb-fix-diffs-viewer-max-lines.yml
changelogs/unreleased/jdb-fix-diffs-viewer-max-lines.yml
+5
-0
No files found.
app/assets/javascripts/diffs/constants.js
View file @
ddaa445e
...
...
@@ -34,7 +34,6 @@ export const COUNT_OF_AVATARS_IN_GUTTER = 3;
export
const
LENGTH_OF_AVATAR_TOOLTIP
=
17
;
export
const
LINES_TO_BE_RENDERED_DIRECTLY
=
100
;
export
const
MAX_LINES_TO_BE_RENDERED
=
2000
;
export
const
DIFF_FILE_SYMLINK_MODE
=
'
120000
'
;
export
const
DIFF_FILE_DELETED_MODE
=
'
0
'
;
...
...
app/assets/javascripts/diffs/store/utils.js
View file @
ddaa445e
...
...
@@ -11,7 +11,6 @@ import {
OLD_LINE_TYPE
,
MATCH_LINE_TYPE
,
LINES_TO_BE_RENDERED_DIRECTLY
,
MAX_LINES_TO_BE_RENDERED
,
TREE_TYPE
,
INLINE_DIFF_VIEW_TYPE
,
PARALLEL_DIFF_VIEW_TYPE
,
...
...
@@ -457,12 +456,10 @@ function getVisibleDiffLines(file) {
}
function
finalizeDiffFile
(
file
)
{
const
name
=
(
file
.
viewer
&&
file
.
viewer
.
name
)
||
diffViewerModes
.
text
;
const
lines
=
getVisibleDiffLines
(
file
);
Object
.
assign
(
file
,
{
renderIt
:
lines
<
LINES_TO_BE_RENDERED_DIRECTLY
,
collapsed
:
name
===
diffViewerModes
.
text
&&
lines
>
MAX_LINES_TO_BE_RENDERED
,
isShowingFullFile
:
false
,
isLoadingFullFile
:
false
,
discussions
:
[],
...
...
changelogs/unreleased/jdb-fix-diffs-viewer-max-lines.yml
0 → 100644
View file @
ddaa445e
---
title
:
Fix client usage of max line rendering
merge_request
:
40741
author
:
type
:
fixed
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