diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-08 08:51:30 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-08 08:51:30 +0000 |
commit | b3b9817e5100ae2e827794d87ac6a6649571eddc (patch) | |
tree | 76f13ac4eee8a1f0c34248066d05863beb7f0e90 /spec/javascripts | |
parent | 32c4d7721b5e4cd99ff84d5f12163a2514f616b9 (diff) | |
parent | 198402b38b59a43aa6e50259d7c13c0097dbdfac (diff) | |
download | gitlab-ce-b3b9817e5100ae2e827794d87ac6a6649571eddc.tar.gz |
Merge branch 'osw-revert-comment-in-any-diff-line' into 'master'
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"
See merge request gitlab-org/gitlab-ce!22891
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/diffs/store/mutations_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/diffs/store/mutations_spec.js b/spec/javascripts/diffs/store/mutations_spec.js index 8821cde76f4..fed04cbaed8 100644 --- a/spec/javascripts/diffs/store/mutations_spec.js +++ b/spec/javascripts/diffs/store/mutations_spec.js @@ -98,7 +98,7 @@ describe('DiffsStoreMutations', () => { it('should call utils.addContextLines with proper params', () => { const options = { lineNumbers: { oldLineNumber: 1, newLineNumber: 2 }, - contextLines: [{ oldLine: 1, newLine: 1, lineCode: 'ff9200_1_1', discussions: [] }], + contextLines: [{ oldLine: 1 }], fileHash: 'ff9200', params: { bottom: true, @@ -110,7 +110,7 @@ describe('DiffsStoreMutations', () => { parallelDiffLines: [], }; const state = { diffFiles: [diffFile] }; - const lines = [{ oldLine: 1, newLine: 1 }]; + const lines = [{ oldLine: 1 }]; const findDiffFileSpy = spyOnDependency(mutations, 'findDiffFile').and.returnValue(diffFile); const removeMatchLineSpy = spyOnDependency(mutations, 'removeMatchLine'); |