Merge branch 'fix-up-notes-technical-debt' into 'master'

Fix up some notes.js tech debt See merge request !11283

Merge branch 'fix-up-notes-technical-debt' into 'master'
Fix up some notes.js tech debt See merge request !11283
60ceffe4 · Fatih Acet · 8a9e2415 · 20bd76da · 60ceffe4 · 60ceffe4
展开全部隐藏空白更改
内联并排

Showing with 115 addition and 109 deletion

app/assets/javascripts/notes.js app/assets/javascripts/notes.js +115 -108

spec/javascripts/notes_spec.js spec/javascripts/notes_spec.js +0 -1

未找到文件。
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
--- a/spec/javascripts/notes_spec.js
+++ b/spec/javascripts/notes_spec.js
@@ -128,7 +128,6 @@ import '~/notes';
      beforeEach(() => {
        note = {
          id: 1,
-          discussion_html: null,
          valid: true,
          note: 'heya',
          html: '<div>heya</div>',