diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-09-19 15:03:37 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-09-19 15:03:37 +0000 |
| commit | 38cf0b67b588b6f07adb0bde048ca4f568816598 (patch) | |
| tree | 41cb3544a0f79c9a847855072e459d2c3ddc6fbe /app/assets/javascripts/diffs/store/mutations.js | |
| parent | 9e4e1aee500b44e2568fc439ae53077967ebb0c3 (diff) | |
| parent | 90673dbcb82f78c53d071994ca65e3ace7a28f62 (diff) | |
| download | gitlab-ce-38cf0b67b588b6f07adb0bde048ca4f568816598.tar.gz | |
Merge branch 'mr-legacy-diff-notes' into 'master'
Re-enable legacy diff notes on merge request diffs
Closes #48873
See merge request gitlab-org/gitlab-ce!21652
Diffstat (limited to 'app/assets/javascripts/diffs/store/mutations.js')
| -rw-r--r-- | app/assets/javascripts/diffs/store/mutations.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index 6dc5bf16c65..59a2c09e54f 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -90,16 +90,18 @@ export default { const firstDiscussion = discussions[0]; const isDiffDiscussion = firstDiscussion.diff_discussion; const hasLineCode = firstDiscussion.line_code; - const isResolvable = firstDiscussion.resolvable; const diffPosition = diffPositionByLineCode[firstDiscussion.line_code]; if ( selectedFile && isDiffDiscussion && hasLineCode && - isResolvable && diffPosition && - isDiscussionApplicableToLine(firstDiscussion, diffPosition) + isDiscussionApplicableToLine({ + discussion: firstDiscussion, + diffPosition, + latestDiff: state.latestDiff, + }) ) { const targetLine = selectedFile.parallelDiffLines.find( line => |