diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-15 13:18:13 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-15 12:16:17 -0500 |
| commit | 1322bd78cf593ecf82fa3e449804501d9d652ddc (patch) | |
| tree | c48c908b7c39168fd59a5ec9c1ea690ae0f2519a | |
| parent | 19daba8a6f170e38bcd7371bab2d582d5324b215 (diff) | |
| download | gitlab-ce-1322bd78cf593ecf82fa3e449804501d9d652ddc.tar.gz | |
Merge branch 'rs-issue-4032' into 'master'
Fix note polling
Closes #4032
See merge request !2084
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 88b949a27ab..ae6e9f6fd38 100644 --- 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 |