diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-13 16:13:12 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | 9c30b0e918ca035d8555de5e3393247f6d00ed16 (patch) | |
| tree | 7aeea9695748036cf465952711184f2469427fab /app/controllers/projects/notes_controller.rb | |
| parent | 336016fa858dfa48b9f9e9b5b2d9c3a9000fffe5 (diff) | |
| download | gitlab-ce-9c30b0e918ca035d8555de5e3393247f6d00ed16.tar.gz | |
Fix some specs
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index f80313bbee0..186098c67b7 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -169,6 +169,8 @@ class Projects::NotesController < Projects::ApplicationController discussion = note.to_discussion(noteable) unless discussion.render_as_individual_notes? attrs.merge!( + discussion_resolvable: discussion.resolvable?, + diff_discussion_html: diff_discussion_html(discussion), discussion_html: discussion_html(discussion), |