Merge branch 'rs-issue-4032' into 'master'

Fix note polling Closes #4032 See merge request !2084

Merge branch 'rs-issue-4032' into 'master'
Fix note polling Closes #4032 See merge request !2084
1322bd78 · Douwe Maan · Robert Speicher · 19daba8a · 1322bd78
Commit 1322bd78 authored Dec 15, 2015 by Douwe Maan Committed by Robert Speicher Dec 15, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

app/controllers/projects/notes_controller.rb app/controllers/projects/notes_controller.rb +2 -1

No files found.
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -13,7 +13,8 @@ class Projects::NotesController < Projects::ApplicationController
    @notes.each do |note|
      notes_json[:notes] << {
        id: note.id,
-        html: note_to_html(note)
+        html: note_to_html(note),
+        valid: note.valid?
      }
    end