diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-26 15:09:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-26 15:09:50 +0300 |
| commit | ae4756174c3c379caeca8da50ade9675e157ae95 (patch) | |
| tree | 96efa063ad7ea7363388b84bfc034b4d4cd7b554 /app/assets/javascripts/diffs | |
| parent | 52fd2a9921bdaa1938143703811f565a7c60a8c4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/diffs')
| -rw-r--r-- | app/assets/javascripts/diffs/store/utils.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js index 5656416cf2b..92f3cf83740 100644 --- a/app/assets/javascripts/diffs/store/utils.js +++ b/app/assets/javascripts/diffs/store/utils.js @@ -62,7 +62,7 @@ export const parallelizeDiffLines = (diffLines, inline) => { const line = diffLines[i]; line.chunk = chunk; - if (isMeta(line)) chunk += 1; + if (isMeta(line) && line.type !== EXPANDED_LINE_TYPE) chunk += 1; if (isRemoved(line) || isConflictOur(line) || inline) { lines.push({ |