diff options
author | Phil Hughes <me@iamphill.com> | 2018-09-18 16:27:53 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-09-18 16:27:53 +0100 |
commit | 90673dbcb82f78c53d071994ca65e3ace7a28f62 (patch) | |
tree | 2eda6d72e31126eb60b74e17a6c8625021643893 /app/assets | |
parent | c48f0c1aed8f6a0db43afb27ad5f3cc13f09dedc (diff) | |
download | gitlab-ce-90673dbcb82f78c53d071994ca65e3ace7a28f62.tar.gz |
Changed isDiscussionApplicableToLine to accept an object
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/diffs/store/mutations.js | 6 | ||||
-rw-r--r-- | app/assets/javascripts/diffs/store/utils.js | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index c7fcbe01704..59a2c09e54f 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -97,7 +97,11 @@ export default { isDiffDiscussion && hasLineCode && diffPosition && - isDiscussionApplicableToLine(firstDiscussion, diffPosition, state.latestDiff) + isDiscussionApplicableToLine({ + discussion: firstDiscussion, + diffPosition, + latestDiff: state.latestDiff, + }) ) { const targetLine = selectedFile.parallelDiffLines.find( line => diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js index 17732f4eeb6..834a94ea42a 100644 --- a/app/assets/javascripts/diffs/store/utils.js +++ b/app/assets/javascripts/diffs/store/utils.js @@ -254,7 +254,7 @@ export function getDiffPositionByLineCode(diffFiles) { // This method will check whether the discussion is still applicable // to the diff line in question regarding different versions of the MR -export function isDiscussionApplicableToLine(discussion, diffPosition, latestDiff) { +export function isDiscussionApplicableToLine({ discussion, diffPosition, latestDiff }) { const { lineCode, ...diffPositionCopy } = diffPosition; if (discussion.original_position && discussion.position) { |