diff options
author | Phil Hughes <me@iamphill.com> | 2018-09-17 10:11:44 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-09-17 10:11:44 +0100 |
commit | 5c39c7c3b919126f3b052da407cd29aa3167b40e (patch) | |
tree | 9536024fd5ed694d1f169d4e2835cc38a36e8a16 /app | |
parent | 5eef5f242ae160e7dfbfcadc507744343faad401 (diff) | |
download | gitlab-ce-5c39c7c3b919126f3b052da407cd29aa3167b40e.tar.gz |
Updated latestDiff logic to only be used to LegacyDiffNotes
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/diffs/store/mutations.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/diffs/store/utils.js | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index a11ac2b292b..c7fcbe01704 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -86,8 +86,6 @@ export default { }, [types.SET_LINE_DISCUSSIONS_FOR_FILE](state, { fileHash, discussions, diffPositionByLineCode }) { - if (!state.latestDiff) return; - const selectedFile = state.diffFiles.find(f => f.fileHash === fileHash); const firstDiscussion = discussions[0]; const isDiffDiscussion = firstDiscussion.diff_discussion; @@ -99,7 +97,7 @@ export default { isDiffDiscussion && hasLineCode && diffPosition && - isDiscussionApplicableToLine(firstDiscussion, diffPosition) + isDiscussionApplicableToLine(firstDiscussion, diffPosition, 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 36053d8db44..17732f4eeb6 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) { +export function isDiscussionApplicableToLine(discussion, diffPosition, latestDiff) { const { lineCode, ...diffPositionCopy } = diffPosition; if (discussion.original_position && discussion.position) { @@ -264,5 +264,5 @@ export function isDiscussionApplicableToLine(discussion, diffPosition) { return _.isEqual(refs, diffPositionCopy) || _.isEqual(originalRefs, diffPositionCopy); } - return discussion.active && lineCode === discussion.line_code; + return latestDiff && discussion.active && lineCode === discussion.line_code; } |