diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2017-10-07 07:25:17 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-10-07 07:25:17 +0300 |
| commit | b54203f0ada8f7ad6d24437b6f5f46ebf43f8695 (patch) | |
| tree | b903596b4755da406dfd1349a8b2c59a5f38b9d1 /app/controllers | |
| parent | b4f9dc48163c065d776d120dd312c689ce79f653 (diff) | |
Commenting on image diffs
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/notes_actions.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb index 915f32b4c33..1126f706393 100644 --- a/app/controllers/concerns/notes_actions.rb +++ b/app/controllers/concerns/notes_actions.rb @@ -96,7 +96,8 @@ module NotesActions id: note.id, discussion_id: note.discussion_id(noteable), html: note_html(note), - note: note.note + note: note.note, + on_image: note.try(:on_image?) ) discussion = note.to_discussion(noteable) @@ -122,7 +123,9 @@ module NotesActions def diff_discussion_html(discussion) return unless discussion.diff_discussion? - if params[:view] == 'parallel' + on_image = discussion.on_image? + + if params[:view] == 'parallel' && !on_image template = "discussions/_parallel_diff_discussion" locals = if params[:line_type] == 'old' @@ -132,7 +135,9 @@ module NotesActions end else template = "discussions/_diff_discussion" - locals = { discussions: [discussion] } + @fresh_discussion = true + + locals = { discussions: [discussion], on_image: on_image } end render_to_string( |