diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2018-10-22 22:06:05 +0200 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2018-10-22 22:06:05 +0200 |
commit | 53be95daf41fc4e59deab149485210835e7e54cd (patch) | |
tree | 3f377dcc6289049581e2473b7e12f260e774784f /app/assets/javascripts/ide/lib/diff/diff.js | |
parent | 3fb7a1f97a812b7b2b5e80a8a0575cb7bfd2d3c4 (diff) | |
parent | d6be7ed79557ce31a5d0062ceea00c877157a6c7 (diff) | |
download | gitlab-ce-53be95daf41fc4e59deab149485210835e7e54cd.tar.gz |
Merge branch 'master' into scheduled-manual-jobs-environment-play-buttons
Conflicts:
spec/javascripts/environments/environment_actions_spec.js
Diffstat (limited to 'app/assets/javascripts/ide/lib/diff/diff.js')
-rw-r--r-- | app/assets/javascripts/ide/lib/diff/diff.js | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/javascripts/ide/lib/diff/diff.js b/app/assets/javascripts/ide/lib/diff/diff.js index 0e37f5c4704..9b7ed68b893 100644 --- a/app/assets/javascripts/ide/lib/diff/diff.js +++ b/app/assets/javascripts/ide/lib/diff/diff.js @@ -11,14 +11,16 @@ export const computeDiff = (originalContent, newContent) => { if (findOnLine) { Object.assign(findOnLine, change, { modified: true, - endLineNumber: (lineNumber + change.count) - 1, + endLineNumber: lineNumber + change.count - 1, }); } else if ('added' in change || 'removed' in change) { - acc.push(Object.assign({}, change, { - lineNumber, - modified: undefined, - endLineNumber: (lineNumber + change.count) - 1, - })); + acc.push( + Object.assign({}, change, { + lineNumber, + modified: undefined, + endLineNumber: lineNumber + change.count - 1, + }), + ); } if (!change.removed) { |