diff options
| author | Phil Hughes <me@iamphill.com> | 2018-09-13 12:35:42 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-09-17 09:50:37 +0100 |
| commit | ef4e3b6ed37e2e1b92c1ab39e5f94d908dddb279 (patch) | |
| tree | 0d4ce3e3949d35c68bf0019f8279c469be042367 /app/assets/javascripts/diffs/store/mutations.js | |
| parent | f9e290b9dbcc6340d0f8fcf98fabdcdbac3a0b10 (diff) | |
| download | gitlab-ce-ef4e3b6ed37e2e1b92c1ab39e5f94d908dddb279.tar.gz | |
Moved legacy diff note check into util method
Un-commented out expect checks in mutation spec
Diffstat (limited to 'app/assets/javascripts/diffs/store/mutations.js')
| -rw-r--r-- | app/assets/javascripts/diffs/store/mutations.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index b6818f905e5..72da64bd4db 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -1,5 +1,6 @@ import Vue from 'vue'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import { isLegacyDiffNote } from '~/notes/stores/utils'; import { findDiffFile, addLineReferences, @@ -90,8 +91,7 @@ export default { const firstDiscussion = discussions[0]; const isDiffDiscussion = firstDiscussion.diff_discussion; const hasLineCode = firstDiscussion.line_code; - const isResolvable = - firstDiscussion.resolvable || (!firstDiscussion.resolvable && !firstDiscussion.position); + const isResolvable = firstDiscussion.resolvable || isLegacyDiffNote(firstDiscussion); const diffPosition = diffPositionByLineCode[firstDiscussion.line_code]; if ( |