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

Fix up some notes tech debt -- EE merge edition See merge request !1911

Merge branch 'ee-fix-up-notes-technical-debt' into 'master'
Fix up some notes tech debt -- EE merge edition See merge request !1911
817c1151 · Fatih Acet · 1ae57c83 · fefdf143 · 817c1151 · 817c1151
Commit 817c1151 authored May 29, 2017 by Fatih Acet
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 115 additions and 109 deletions

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

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

No files found.
--- 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>',