diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-05-11 01:41:46 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-05-14 01:31:43 +0300 |
| commit | 99d3e21f19ffb5cccb58fdfeac4fb6174e7e65e2 (patch) | |
| tree | 3dae33d98b9688a3f7e9a4c923f555920d86652b /app/controllers/projects/notes_controller.rb | |
| parent | 5e130c3e39febcd577e61ebd30bd231827d41f2c (diff) | |
Extract LegacyDiffNote out of Note
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 707a0d0e5c6..4a57cd29a20 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -96,7 +96,7 @@ class Projects::NotesController < Projects::ApplicationController end def note_to_discussion_html(note) - return unless note.for_diff_line? + return unless note.diff_note? if params[:view] == 'parallel' template = "projects/notes/_diff_notes_with_reply_parallel" @@ -120,7 +120,7 @@ class Projects::NotesController < Projects::ApplicationController end def note_to_discussion_with_diff_html(note) - return unless note.for_diff_line? + return unless note.diff_note? render_to_string( "projects/notes/_discussion", @@ -158,7 +158,7 @@ class Projects::NotesController < Projects::ApplicationController def note_params params.require(:note).permit( :note, :noteable, :noteable_id, :noteable_type, :project_id, - :attachment, :line_code, :commit_id + :attachment, :line_code, :commit_id, :type ) end |